Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 15801) +++ /applications/editors/josm/i18n/po/ar.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:38+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:32+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,8 +17,8 @@ "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-05-23 20:15+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -26,68 +26,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "لم أتمكن من قراءة الإسقاط من التفضيلات. إستعمال EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "التغييرات غير المحفوظة" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "حفظ و خروج" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "تجاهل و خروج" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +96,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +103,10 @@ msgstr "إلغاء" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "إضافات" @@ -254,15 +255,15 @@ msgstr "خط الطول" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "نظم العقد على حلقة" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "حرّك العقد المحددة إلى الحلقة" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +272,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +295,9 @@ msgstr "العدة: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "بعض العقد موجودة (تقريباً) في الخطّ" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "الرجاء إختيار أربعة عقد على الأقل." @@ -330,5 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "التناقض" @@ -468,5 +470,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -477,7 +479,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "أحذف" @@ -487,14 +489,15 @@ msgstr "امحي الأغراض المختارة." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "الكتابة فوقه" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "الملف موجود. الكتابة عليه ؟" @@ -522,9 +525,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -562,16 +565,4 @@ msgstr "أخرُج من التطبيق." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "ملفات الخادم أو.أس.أم" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "ملفات GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "ملفات NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -643,12 +634,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -656,5 +647,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "خطأ" @@ -675,5 +666,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -786,4 +777,18 @@ msgstr "إدمج {0} عقد" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -840,67 +845,25 @@ msgstr "غيرمسمى" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "إفتح..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "إفتح ملف." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "خطء عند تحليل {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "إمتداد الملف غير معروف: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "الإحداثيات المستوردة: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "جمل غير صحيحة التكوين: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "" - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "جُمل غير معروفة: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "إحداثيات 0 " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "نجاح إسيراد NMEA" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "فشل إستيراد NMEA !" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -971,5 +934,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "ألصِق" @@ -998,5 +961,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "التفضيلات" @@ -1042,14 +1005,19 @@ msgstr "أعكس إتجاه الطرقات" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "إحفَظ" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "إحفظ المعطيات الحالية." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1057,26 +1025,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "مستند فارغ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "لا يحتوي المستند على أي معطيات." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "رغم ذلك احفظه" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "التناقضات" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1084,32 +1052,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "إحفظ ملف أو.أس.أم" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "إحفظ ملف GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "إحفظ ملف أو.أس.أم" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "إمتداد ملف غير معروف." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "حصل خطأ عند الحفظ." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "" @@ -1242,56 +1214,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "إختر أي من :" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +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 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1301,9 +1273,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1311,5 +1283,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1367,50 +1339,50 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "حمّل إلى أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "حمّل هذه التغييرات :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1614,14 +1586,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "انشئ عقدة جديدة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "إختر العقدة الموجودة تحت المزلاق." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1630,14 +1602,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "إبدء طريق جديدة من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "تابع طريق من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "إنهي الرسم." @@ -1657,5 +1629,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1666,5 +1638,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "" @@ -1699,10 +1671,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1725,16 +1697,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1742,145 +1714,155 @@ msgstr "لم يتم تحميل أي معطيات." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "إستبدل الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "أضف إلى اخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "أحذف من الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "عبارة منتظمة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "الأهداف المميزة:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1894,14 +1876,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "" @@ -1937,7 +1949,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "أضِف" @@ -1978,4 +1990,8 @@ msgstr "عيّن {0}={1} لِــ {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -1983,60 +1999,10 @@ msgstr "حلّ {0} التناقضات في {1} أغراض" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "أمحي {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "أمحي {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "علاقة متناقضة" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "أمحي من العلاقة" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "حرك" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2052,167 +2018,23 @@ msgstr[5] "عقد" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "أدر" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "التعاقب" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "طبّق ؟" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "طبق التغييرات المختارة" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "لا تطبق التغييرات" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "خصائص " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "غير قادر على فتح دليل التفضيلات: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "مختلف" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "تم حذفه" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "حقيقي" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "خاطئ" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "المكان" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "درجات عشرية" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "درجات دقائق ثواني" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "ج." - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "ش." - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "غ." - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "ش." - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "غير كامل" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "خطأ : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "تحذير: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "طريق" +msgstr[1] "طريقين" +msgstr[2] "طرق" +msgstr[3] "طرقات" +msgstr[4] "طرقات" +msgstr[5] "طرقات" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2228,4 +2050,257 @@ msgstr[5] "علاقة" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "أمحي {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "أمحي {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "علاقة متناقضة" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "أمحي من العلاقة" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "حرك" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "أدر" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "التعاقب" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "طبّق ؟" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "مختلف" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "تم حذفه" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "حقيقي" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "خاطئ" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "المكان" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "درجات عشرية" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "درجات دقائق ثواني" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "ج." + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "ش." + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "غ." + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "ش." + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "غير كامل" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "خطأ : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "تحذير: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2264,142 +2339,129 @@ msgstr[5] "{0} عقد" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "عضو فارغ في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "أمحي العضو ''{0}'' في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "للطريق ''{0}'' أقل من نقطتين." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "دور غير معروف ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "نوع عضو غير معروف لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "لم أجد طريق \"من\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "لم أجد طريق \"إلى\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "النص" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "طريق" -msgstr[1] "طريقين" -msgstr[2] "طرق" -msgstr[3] "طرقات" -msgstr[4] "طرقات" -msgstr[5] "طرقات" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2421,5 +2483,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2490,4 +2552,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2502,4 +2565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2702,26 +2766,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2730,21 +2794,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "أعرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "أقلب عرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "أقلب عرض ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "سمعيّ" @@ -2854,4 +2918,493 @@ msgstr "جاري التهيئة" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "الأعضاء" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "أزِل" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "الدّور" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2865,5 +3418,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2894,33 +3447,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "التناقض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "دمج التناقضات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "حلّ التناقضات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "التناقضات: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "التحذير" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3080,10 +3677,4 @@ msgid "Member Of" msgstr "عضو من" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "الدّور" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3271,8 +3862,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "الأعضاء" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3306,11 +3893,4 @@ msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "أزِل" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3365,5 +3945,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3388,5 +3968,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3413,24 +3993,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "الأعضاء: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "محرّر العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "حصل تعارض حين الإستيراد." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "خطأ عند التحليل النحوي لردّ المخدم." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "غير قادر على الإتصال بلمخدم." @@ -3683,10 +4263,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "التحذير" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3729,5 +4303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3765,53 +4339,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "نقطة gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "إستعمل الإعدادات العامة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "أرسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "حدد خيارات رسم الخطوط" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "خصّص اللون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "مُوافق" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3819,6 +4393,6 @@ msgstr "الغيابي" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3826,31 +4400,31 @@ msgstr "إختر لون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "إستورد صوت مسجل" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "ملفات صوتيت (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "العلامات الصوتية من {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "إستورد صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3859,5 +4433,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3866,5 +4440,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3873,28 +4447,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "الإسم: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "الوصف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "الفترة الزمنية " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "الطول: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3905,11 +4479,11 @@ "مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3919,29 +4493,29 @@ msgstr "محوّل من: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} أمتار" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} كلم²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3950,9 +4524,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3960,5 +4534,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3975,24 +4549,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} ممحي.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4036,5 +4610,5 @@ msgstr[5] "نقاط" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4043,5 +4617,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4050,5 +4624,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4189,5 +4763,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "" @@ -5522,5 +6096,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "حدّث" @@ -5532,6 +6106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5540,4 +6113,8 @@ msgid "Please select an entry." msgstr "الرجاء إختيار خانة." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5895,5 +6472,5 @@ msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5904,15 +6481,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5926,18 +6503,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -5975,7 +6552,52 @@ msgstr "جاري تحضير المعطيات..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "ملفات GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +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/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "ملفات NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "الإحداثيات المستوردة: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "جمل غير صحيحة التكوين: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "" + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "جُمل غير معروفة: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "إحداثيات 0 " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "نجاح إسيراد NMEA" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "فشل إستيراد NMEA !" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6033,4 +6655,13 @@ msgid "Unknown host" msgstr "مضيف غير معروف" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6059,8 +6690,16 @@ msgstr "إجهاض..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "خطأ تحليل نحوي" +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "ملفات الخادم أو.أس.أم" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6104,7 +6743,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "أمحي العضو ''{0}'' في العلاقة." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6150,5 +6789,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6168,15 +6807,20 @@ msgstr "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6186,20 +6830,31 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" msgstr "" @@ -6216,25 +6871,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6242,21 +6897,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6264,5 +6919,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6270,19 +6925,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6290,5 +6945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6296,19 +6951,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "المعلومات" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "لا يوجدأي وصف" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6317,13 +6972,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6333,9 +6988,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6345,10 +7000,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6371,37 +7022,14 @@ msgstr "مجهول" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: الإصدار {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6542,9 +7170,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6712,4 +7335,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "خطء عند تحليل {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -6931,6 +7559,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -7247,36 +7875,41 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" msgstr "" @@ -7286,16 +7919,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7304,14 +7942,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "خطء في صيغة المعطيات" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7352,7 +7990,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "جدول نهر" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7783,7 +8420,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "الماء" @@ -8159,16 +8796,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "إمتداد الملف غير معروف: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8255,5 +8897,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8280,25 +8922,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8471,11 +9113,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8485,8 +9127,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8497,5 +9135,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8504,5 +9142,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8524,7 +9162,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9412,7 +10056,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "" @@ -9426,5 +10070,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9514,4 +10158,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9588,36 +10248,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9631,51 +10291,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9761,7 +10421,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9911,6 +10570,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10728,5 +11392,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10774,5 +11438,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10809,5 +11473,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11039,6 +11703,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11064,6 +11728,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11089,6 +11753,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "" @@ -11114,6 +11778,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "" @@ -11127,5 +11791,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11143,5 +11807,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "" @@ -11159,5 +11823,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11184,6 +11848,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11233,5 +11897,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "" @@ -12210,5 +12874,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -13932,27 +14596,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "الرياضة" @@ -16790,8 +17454,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "" @@ -16852,6 +17516,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16862,8 +17524,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -16889,5 +17551,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "" @@ -16972,4 +17634,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -16984,8 +17647,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17005,5 +17670,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17093,7 +17758,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "جسر" @@ -17357,15 +18022,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "مهجور" @@ -17407,5 +18072,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "خيل" @@ -17615,11 +18280,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17657,6 +18322,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "شارع" @@ -17712,7 +18377,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17768,8 +18433,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "سكة حديد" @@ -17790,5 +18455,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17802,5 +18467,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17821,5 +18486,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "مستديرة دوران" @@ -17834,5 +18499,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17847,5 +18512,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "شاطئ نهر" @@ -17859,5 +18524,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "جدول نهر" @@ -17871,5 +18536,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "حوض سفن" @@ -17897,5 +18562,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "قنة جر" @@ -18063,13 +18728,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "من صنع الإنسان" @@ -18131,7 +18796,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18154,10 +18819,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18187,6 +18852,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "سكة حديد قديمة" @@ -18231,6 +18896,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18244,5 +18909,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18264,5 +18929,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18276,5 +18941,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18322,7 +18987,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "خط جوي" @@ -18339,5 +19004,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18352,5 +19017,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18365,5 +19030,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18378,5 +19043,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18391,5 +19056,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18404,5 +19069,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18507,10 +19172,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "طاقة" @@ -18523,8 +19188,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "رصيف ميناء" @@ -18538,5 +19201,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "خط أنابيب" @@ -18664,12 +19327,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "وقت الفراغ" @@ -18683,5 +19346,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "مارينا" @@ -18753,8 +19416,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18856,10 +19519,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19245,22 +19908,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19292,6 +19955,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19352,8 +20015,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "صحة" @@ -19706,26 +20369,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "متجر/دكان" @@ -19797,8 +20460,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "فندق" @@ -19948,9 +20611,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "سياحة" @@ -20022,8 +20685,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "تاريخي" @@ -20094,8 +20757,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "خضار" @@ -20109,5 +20772,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "كسارة / مقلع حجارة" @@ -20121,5 +20784,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20141,5 +20804,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "حوض" @@ -20153,5 +20816,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "غابة" @@ -20165,5 +20828,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "فناء مزرعة" @@ -20186,5 +20849,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "بيع بلمفرق" @@ -20198,5 +20861,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "صناعي" @@ -20210,5 +20873,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20222,5 +20885,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "حقل خضار" @@ -20234,5 +20897,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20289,7 +20952,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "عسكري" @@ -20303,5 +20966,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "مقبرة/جبانة" @@ -20314,5 +20977,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "قمّة" @@ -20327,5 +20990,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "نهر الجليد" @@ -20339,5 +21002,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "بركان" @@ -20392,8 +21055,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "طبيعي" @@ -20407,5 +21070,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "أشجار منخفضة" @@ -20419,5 +21082,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "أرض بور" @@ -20431,5 +21094,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "غابة/حرش" @@ -20443,5 +21106,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "طين" @@ -20455,5 +21118,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "شاطئ" @@ -20531,8 +21194,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "طريق" @@ -20580,7 +21243,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "الحدود" @@ -20722,10 +21385,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "المكان" @@ -20773,6 +21436,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "العنوان" @@ -21003,10 +21666,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21054,4 +21717,15 @@ msgstr "شوارع NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Commit comment" #~ msgstr "أودع الملاحظات" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 15801) +++ /applications/editors/josm/i18n/po/bg.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:45+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:34+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"Проекцията не може да бъде прочетена от настройките. Ще използваме EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Незаписани промени" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Има несъхранени промени. Да ги отхвърлим ли за да продължим?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Запис и Изход" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Откажи промените и Изход" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +102,10 @@ msgstr "Отмяна" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Разширения" @@ -254,15 +254,15 @@ msgstr "Геогр. Дължина:" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Подреди точките в кръг" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Преместване на избраните точки така, че да сформират окръжност." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +294,9 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Някои от точките са (почти) на една права" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Моля изберете поне четири точки." @@ -330,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "конфликт" @@ -474,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -483,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Изтриване" @@ -493,14 +494,15 @@ msgstr "Изтриване на избраните обекти." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Презаписване" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Файлът съществъва. Да го подменя ли?" @@ -529,9 +531,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -570,16 +572,4 @@ msgstr "Изход от програмата." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM сървърни файлове" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX файлове" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 файлове" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -653,12 +643,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -666,5 +656,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Грешка" @@ -685,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -803,4 +793,18 @@ msgstr "Обедини {0} точки" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -857,67 +861,25 @@ msgstr "неименуван" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Отвори..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Отваряне на файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Грешка при разбор {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Непознато разширение на файл: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Маркери от {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Координати импортирани: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Неправилно съставено изречение: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Грешка в контролните суми: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Неизвестно изречение: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Нулеви координати: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Успешно NMEA импортиране" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Грешка при NMEA импортиране!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -993,5 +955,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Поставяне" @@ -1020,5 +982,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Настройки" @@ -1064,14 +1026,19 @@ msgstr "Промяна посоката на линиите" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Запазване" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Запазване на текущите данни." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1081,26 +1048,26 @@ "информирайте за тази грешка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Няма отворени документи. Няма какво да се съхранява." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Празен документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Документът не съдържа данни" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Записване въпреки всичко" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Конфликти" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1110,32 +1077,36 @@ "обработени все едно сте ги отменили всички. Да продължаваме ли?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Отхвърляне конфликтите и записване" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Съхраняване OSM файл" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Съхраняване GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Съхраняване OSM файл" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Невъзможно да се създаде резервно копие." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Неизвестно файлово разширение." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Възникна грешка при записване." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Възникна грешка при възстановяване на резервно копие." @@ -1278,54 +1249,54 @@ msgstr "Вкл./изкл. глобалната настройка ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разсъедини пътища" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублиране на точки, които се използват от няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "Тази точка не е свързана с към нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "Никой от тези точки не са прикрепени за нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "Нито една от тези тези линии не е прикрепена за други" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "Текущато избраните обекти не може да се разсъединят." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Изберете един от вариантите:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Един маркиран възел, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "* One node that is used by more than one way, or" msgstr "* Една точка, която се използва от няколко линии, или" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +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 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Една точка, която се използва от няколко линии и една от тези линии, или" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Една линия, която има точки, които се използват от няколко линии, или" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1333,5 +1304,5 @@ "няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1344,9 +1315,9 @@ "дублирани възли и всички възли ще бъдат избрани." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Незапелен възел" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1354,5 +1325,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1415,50 +1386,50 @@ "да продължите?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Качи на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Качване на всички промени на OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Обекти за добавяне:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Променени обекти:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Обекти за изтриване:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишете измененията на качваните от вас данни:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Качване на тези промени?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Качване на промени" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Нищо за качване. Първо създайте някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Има неразрешени конфликти. Първо трябва да ги разрешите." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Няма промени за качване." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1665,14 +1636,14 @@ msgstr "Добавяне на точка към път и съединяване" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Създаване нов възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Избиране на точката под курсора." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1681,14 +1652,14 @@ msgstr[1] "Вмъкване на нов възел в {0} пътя." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Започване на нов път от последния възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Продължаване на път от последния възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Завършване на чертането." @@ -1708,5 +1679,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника." @@ -1718,5 +1689,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Отпуснете бутона на мишката за да спрете въртенето." @@ -1754,5 +1725,5 @@ msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1761,5 +1732,5 @@ "най-близката точка." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1787,16 +1758,16 @@ "десния бутон на мишката" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1804,53 +1775,63 @@ msgstr "Никакви данни не са заредени." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "замени селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "добави към селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "изтрий от селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "чувствителност към регистъра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "регулярен израз" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "Специални цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1859,47 +1840,47 @@ "линия / път, relation - релация)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1907,46 +1888,46 @@ "ключ съдържа двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "Стартиране търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1964,15 +1945,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Липсват параметри за \"ИЛИ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Липсват параметри за \"НЕ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." msgstr "Липсва затваряща скоба." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -2007,7 +2018,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Добави" @@ -2047,4 +2058,8 @@ msgstr "Задаване {0}={1} за {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2052,65 +2067,10 @@ msgstr "Разрешаване {0} конфликти в {1} обекти" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Изтриване {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Изтриване {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Конфликтиращи релации" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Изтриване от релация" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -msgid "Split way segment" -msgstr "Разделяне пътен сегмент" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Преместване" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2122,169 +2082,19 @@ msgstr[1] "възли" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Премахване на член в релация" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Завъртане" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Последователност" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Прилагане?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Приложи избраните промени" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Не прилагай промените" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "Моля, изберете кои промени на параметри желаете да приложите." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Свойства на " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Роли в релации, отнасящи се за" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Автоматично поправяне на маркерите" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Грешка в конфигурационния файл на линии {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Не може да се отвори директорията с предпочитания: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "различно" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "изтрито" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "истина" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "лъжа" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "позиция" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Десетични градуси" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Градуси, минути, секунди" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "Ю" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "С" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "З" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "И" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "непълен" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Грешка: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Предупреждение: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "път" +msgstr[1] "пътища" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2296,4 +2106,264 @@ msgstr[1] "релации" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Изтриване {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Изтриване {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Конфликтиращи релации" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Изтриване от релация" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +msgid "Split way segment" +msgstr "Разделяне пътен сегмент" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Преместване" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Премахване на член в релация" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Завъртане" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Последователност" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Прилагане?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "различно" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "изтрито" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "истина" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "лъжа" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "позиция" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Десетични градуси" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Градуси, минути, секунди" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "Ю" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "С" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "З" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "И" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "непълен" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Грешка: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Предупреждение: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2328,138 +2398,129 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Път, обознаващ граница на област, не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "мултиполигонен път ''{0}'' не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "В релацията има празен член." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В релацията има член ''{0}'', който е бил изтрит." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Пътя ''{0}'' е с по-малко от две точки." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Повече от един път \"от\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Повече от един път \"до\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Повече от един \"през\" са открити." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестна роля ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестен тип членство за ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Не е намерен път \"от\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Не е намерен път \"до\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Не е открит възел или път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"до\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"от\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"до\" не започва или свършва в път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Стил за ограничение {0} не е намерен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Не-Път ''{0}'' в мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Липсва външен път за мултиполигон ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Вътрешният път ''{0}'' се намира отвън." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стилът за външния път ''{0}'' се разминава." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "немаркиран" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "текст" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "път" -msgstr[1] "пътища" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2481,5 +2542,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2567,4 +2628,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2579,4 +2641,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2787,26 +2850,26 @@ msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2815,21 +2878,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Превключване режим каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Пълен екран" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Превключване изглед на цял екран" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Аудио" @@ -2940,4 +3003,493 @@ msgstr "Инициализиране" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Маркери" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Членове" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Премахни" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Роля" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2951,5 +3503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2980,33 +3532,77 @@ msgstr "Изберете на картата всички обекти, избрани в списъка по-горе." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Разрешяване конфликти." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Разрешаване конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Конфликти: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Внимание" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3168,10 +3764,4 @@ msgid "Member Of" msgstr "Член на" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Роля" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3357,8 +3947,4 @@ msgstr "Маркери (празна стойност изтрива маркера)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Членове" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3392,11 +3978,4 @@ msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Премахни" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3451,5 +4030,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3474,5 +4053,5 @@ msgstr "да" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3499,24 +4078,24 @@ msgstr "не" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Членове: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор релации: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Възникнаха конфликти при импортване." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Грешка при разбор на отговора на сървъра." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Невъзможно да се установи връзка със сървъра." @@ -3773,10 +4352,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Внимание" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3815,5 +4388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3851,53 +4424,53 @@ msgstr "Въведенето време не може да бъде използвано." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "GPS точка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Настройка рисуването на линии" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Използвай глобалните настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "Чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Не чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Избиране варианти за чертане на линиите." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Избор цвят" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "ОК" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3905,6 +4478,6 @@ msgstr "По подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3912,31 +4485,31 @@ msgstr "Изберете цвят" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Маркери от наименувани точки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Наименувани точки от следа от {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Импорт Аудио" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave аудио файлове (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Аудио маркери от {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Импорт на изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3945,5 +4518,5 @@ msgstr[1] "{0} следи, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3952,5 +4525,5 @@ msgstr[1] "{0} маршрути, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3959,28 +4532,28 @@ msgstr[1] "{0} точки на интерес" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Времеви интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Дължина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Преобразувай в слой данни" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3991,11 +4564,11 @@ "
Ако искате да качвате следи, погледнете тук:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4005,29 +4578,29 @@ msgstr "Преобразувано от: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} метри" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4038,9 +4611,9 @@ "Продължаване?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4050,5 +4623,5 @@ "са пропуснати или преместени в началото." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4067,24 +4640,24 @@ msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} изтрити.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4120,5 +4693,5 @@ msgstr[1] "точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4127,5 +4700,5 @@ msgstr[1] "следа с {0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4134,5 +4707,5 @@ msgstr[1] "{0} се състои от {1} следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4275,5 +4848,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Моля, изберете ред за изтриване." @@ -5640,5 +6213,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Обновяване" @@ -5650,7 +6223,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Добавяне или на site-josm.xml, или на Wiki страници." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5658,4 +6230,8 @@ msgid "Please select an entry." msgstr "Моля, изберете елемент." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6048,5 +6624,5 @@ msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6057,15 +6633,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6075,18 +6651,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Промяна параметри" @@ -6124,7 +6700,52 @@ msgstr "Подготвяне на данните..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX файлове" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Маркери от {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Грешка при разбор: невалидна структура на gpx документа" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 файлове" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Координати импортирани: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Неправилно съставено изречение: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Грешка в контролните суми: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Неизвестно изречение: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Нулеви координати: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Успешно NMEA импортиране" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Грешка при NMEA импортиране!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6185,4 +6806,13 @@ msgstr "Неизвестен хост" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6210,8 +6840,16 @@ msgstr "Прекъсване..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Грешка при разбор." +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "OSM сървърни файлове" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6255,7 +6893,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "В релацията има член ''{0}'', който е бил изтрит." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6301,5 +6939,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6322,15 +6960,20 @@ "повторете опита си по-късно." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Обновяване разширения" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Зареждане на разширенията" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6343,22 +6986,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Разширение {0} изглежда повредено или не може да бъде свалено автоматично." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6375,25 +7028,25 @@ "Внимание - заявено е зареждане на модул {0}. Този модул не се изисква вече." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Модулът не е открит: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последно обновление на модула преди повече от {0} дни." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6404,21 +7057,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Изключване на разширение" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно зареждането на модул {0}. Да се премахне ли от настройките?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Задържане на разширение" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6428,5 +7081,5 @@ "право да презаписва текущите." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6436,10 +7089,10 @@ "\"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Съгласно информацията в разширението, автора е {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6448,9 +7101,9 @@ "за грешка." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Разширението да бъде ли изключено?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6460,5 +7113,5 @@ "да изключим разширенето." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6468,19 +7121,19 @@ "JOSM за този проблем." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Информация" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "няма описание" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6489,13 +7142,13 @@ msgstr[1] "Сваляне на информация за разширението от {0} сайта" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Информация за разширението не е намерена." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Всички инсталирани разширения са последна версия." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6508,9 +7161,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Сваляне на липсващи разширения" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6523,10 +7176,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Зареждане на разширенията" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6549,41 +7198,14 @@ msgstr "неизвестно" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Разширения доставяни с JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Разширението вече съществува" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Архив с разширението вече съществува. Да се свали ли текущата версия и да се " -"се изтрие съществуващия архив?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Изтриване и Зареждане" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Грешка при изтриването на файл на разширение: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6739,9 +7361,4 @@ msgstr "Моля въведете описание за вашата следа." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Маркери" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6913,4 +7530,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файлът {0} е зареден вече под името \"{1}\"" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Грешка при разбор {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7145,6 +7767,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Грешка при зареждане на файла" @@ -7485,37 +8107,42 @@ "един от тях първо, после опитайте отново." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Празен слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Не е векоторизиран." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Център на растера: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Векторизиран." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Комуна bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7524,16 +8151,21 @@ msgstr "Зареждане на WMS слой от файл" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Грешка във формата на файла" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7544,9 +8176,9 @@ "Моля, създайте нов кеш." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Грешка на кеш формата" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7554,5 +8186,5 @@ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Грешка в кеширането на Ламбертовата зона" @@ -7593,7 +8225,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Разделяне на линия" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -8027,7 +8658,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "вода" @@ -8426,16 +9057,21 @@ msgstr "Неизвестен статус на проблема" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "Не е отворена област - невъзможно е да се определят границите!" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Непознато разширение на файл: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8531,5 +9167,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8556,25 +9192,25 @@ msgstr "Отваряне списък с възли на маршрут" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Добавяне на рутиращ слой" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Критерий" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Най-кратък" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Най-бърз" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Обратен маршрут" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Изчистване маршрут" @@ -8748,11 +9384,11 @@ msgstr "край" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Редактиране маркери" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Стартира редактора за маркери" @@ -8762,8 +9398,4 @@ msgstr "JOSM Редактор за маркери" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(никой)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8774,5 +9406,5 @@ msgstr "<няколко>" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8781,5 +9413,5 @@ msgstr[1] "Премахване стари ключове от {0} обекти" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8801,8 +9433,14 @@ msgstr "Филтър" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Изчисти" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9724,7 +10362,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "сграда" @@ -9738,5 +10376,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "област" @@ -9829,4 +10467,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9927,19 +10581,19 @@ "Това може да доведе до погрешни координати." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Автоматично сваляне" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9948,17 +10602,17 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Алфа канал" @@ -9972,51 +10626,51 @@ msgstr "Отворете празен WMS слой за да заредите данни от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Настройки модул WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Име на меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Име на меню (по подразбиране)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (по подразбиране)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Въведете име на меню и WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Копирай стойностите по подразбиране" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Моля изберете ред за копиране." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -10115,11 +10769,7 @@ #: build/trans_plugins.java:17 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 "" -"Основното качество на разширението е възможността за изтриване на точки от " -"GPX следи. Това разширение може да се използва да подготви следа за качване " -"на OSM, примерно чрез изтриване на неинтересните части от следата." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10298,6 +10948,11 @@ "имената на маркерите." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11115,5 +11770,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "частен" @@ -11161,5 +11816,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "с назначение" @@ -11196,5 +11851,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "разрешителен" @@ -11426,6 +12081,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "автомагистрала" @@ -11451,6 +12106,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "автострада" @@ -11476,6 +12131,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "главен / първокласен" @@ -11501,6 +12156,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "второкласен" @@ -11514,5 +12169,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "третокласен" @@ -11530,5 +12185,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "улица" @@ -11546,5 +12201,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "служебна" @@ -11571,6 +12226,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "ремонт" @@ -11620,5 +12275,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "кръгово" @@ -12597,5 +13252,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "блато" @@ -14319,27 +14974,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "спорт" @@ -17177,8 +17832,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "велосипед" @@ -17239,6 +17894,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17249,8 +17902,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "пеш" @@ -17276,5 +17929,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "метро" @@ -17359,4 +18012,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17371,8 +18025,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17392,5 +18048,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "стандартен" @@ -17480,7 +18136,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "мост" @@ -17744,15 +18400,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "остарял, вече невалиден" @@ -17794,5 +18450,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "кон" @@ -18002,11 +18658,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "бариера" @@ -18044,6 +18700,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "улица" @@ -18099,7 +18755,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "път_от_пътна_мрежа" @@ -18155,8 +18811,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "ЖП" @@ -18177,5 +18833,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "услуги" @@ -18189,5 +18845,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "форд" @@ -18208,5 +18864,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "обръщало" @@ -18221,5 +18877,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "точка за връзка със спешна помощ" @@ -18234,5 +18890,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "речен бряг" @@ -18246,5 +18902,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "поток" @@ -18258,5 +18914,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "док" @@ -18284,5 +18940,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "акведукт" @@ -18450,13 +19106,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "изкуствени съоръжения" @@ -18518,7 +19174,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "ЖП точка" @@ -18541,10 +19197,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "друга ЖП линия" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "ЖП railover" @@ -18574,6 +19230,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "стара ЖП линия" @@ -18618,6 +19274,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "въздушен транспорт" @@ -18631,5 +19287,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "терминал" @@ -18651,5 +19307,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "Надземен_транспорт_тъмен" @@ -18663,5 +19319,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "Надземен_транспорт_светъл" @@ -18709,7 +19365,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "надземен транспорт" @@ -18726,5 +19382,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "лесна ски писта" @@ -18739,5 +19395,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "средно трудна ски писта" @@ -18752,5 +19408,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "ски писта за напреднали" @@ -18765,5 +19421,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "ски писта за експерти" @@ -18778,5 +19434,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "ски писта freeride" @@ -18791,5 +19447,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "ски писта за начинаещи" @@ -18894,10 +19550,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "захранване" @@ -18910,8 +19566,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "кей" @@ -18925,5 +19579,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "тръбопровод" @@ -19051,12 +19705,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "отдих и развлечение" @@ -19070,5 +19724,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "яхт пристан" @@ -19140,8 +19794,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "Обществени услуги" @@ -19243,10 +19897,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "Обществен трафик" @@ -19632,22 +20286,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "Обществено осветление" @@ -19679,6 +20333,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "светла_вода" @@ -19739,8 +20393,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "здравеопазване" @@ -20093,26 +20747,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "магазин" @@ -20184,8 +20838,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "хотел" @@ -20335,9 +20989,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "туризъм" @@ -20409,8 +21063,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "исторически" @@ -20481,8 +21135,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "зеленина" @@ -20496,5 +21150,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "кариер" @@ -20508,5 +21162,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "сметище" @@ -20528,5 +21182,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "басейн" @@ -20540,5 +21194,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "гора" @@ -20552,5 +21206,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "двор ферма" @@ -20573,5 +21227,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "търговия на дребно" @@ -20585,5 +21239,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "индустрия" @@ -20597,5 +21251,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "индустриални развалини" @@ -20609,5 +21263,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "зелена площ" @@ -20621,5 +21275,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "ЖП" @@ -20676,7 +21330,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "военни" @@ -20690,5 +21344,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "гробище" @@ -20701,5 +21355,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "връх" @@ -20714,5 +21368,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "ледник" @@ -20726,5 +21380,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "вулкан" @@ -20779,8 +21433,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "природа" @@ -20794,5 +21448,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "храсталак" @@ -20806,5 +21460,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "пустош" @@ -20818,5 +21472,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "гора" @@ -20830,5 +21484,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "кал" @@ -20842,5 +21496,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "плаж" @@ -20918,8 +21572,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "маршрут" @@ -20967,7 +21621,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "граница" @@ -21109,10 +21763,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "място" @@ -21160,6 +21814,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "адрес" @@ -21390,10 +22044,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Отворена въздушна карта (Open Aerial Map)" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21441,4 +22095,32 @@ msgstr "Улици NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници." + +#~ 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 "Navigation" +#~ msgstr "Навигация" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21448,10 +22130,4 @@ #~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." -#~ msgid "Commit comment" -#~ msgstr "Коментар на съхранението" - -#~ msgid "Navigation" -#~ msgstr "Навигация" - #~ msgid "Charge" #~ msgstr "Такса" @@ -21463,4 +22139,13 @@ #~ 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 "Drawbridge" #~ msgstr "Подвижен мост" @@ -21472,4 +22157,21 @@ #~ msgstr "Падаща решетка" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично." + +#~ 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 "viaduct" #~ msgstr "виадукт" @@ -21478,4 +22180,7 @@ #~ msgstr "спортни" +#~ msgid "Delete and Download" +#~ msgstr "Изтриване и Зареждане" + #~ msgid "Edit Drawbridge" #~ msgstr "Редактирай подвижен мост" @@ -21484,4 +22189,13 @@ #~ msgstr "Редактирай падаща решетка" +#~ 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 "" +#~ "Основното качество на разширението е възможността за изтриване на точки " +#~ "от GPX следи. Това разширение може да се използва да подготви следа за " +#~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата." + #~ msgid "Remove route nodes" #~ msgstr "Премахване на възли от маршрут" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 15801) +++ /applications/editors/josm/i18n/po/cs.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-18 16:29+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-29 19:18+0000\n" +"Last-Translator: hanoj \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "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-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,68 +25,71 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" +"Druh kartografické projekce nebyl nalezen v souboru s nastavením. Používám " +"projekci Merkatorovu." + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Neuložené změny" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Uložit a ukončit" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Neuložit změny a ukončit" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -94,5 +97,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -101,10 +104,10 @@ msgstr "Zrušit" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoruji nekorektní URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -188,5 +191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Pluginy" @@ -253,15 +256,15 @@ msgstr "Zeměpisná délka" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Seřadit uzly do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Přesunout označené uzly do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -270,8 +273,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -292,9 +296,9 @@ msgstr "Nástroj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Některé z uzlů jsou (skoro) v přímce" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Vyberte minimálně 4 uzly" @@ -329,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -469,5 +473,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -478,7 +482,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Smazat" @@ -488,14 +492,15 @@ msgstr "Smazat označené objekty" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Přepsat" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Soubor již existuje. Chcete jej přepsat ?" @@ -523,9 +528,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -563,16 +568,4 @@ msgstr "Ukončit JOSM" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Soubory z OSM serveru" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX soubory" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 soubory" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -646,12 +639,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -659,5 +652,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Chyba" @@ -678,5 +671,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -792,4 +785,18 @@ msgstr "Spojit {0} uzly" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -846,67 +853,25 @@ msgstr "nepojmenováno" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Otevřít..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Otevřít soubor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Chyba při parsování {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Neznámá koncovka souboru: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Značky z {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Importované souřadnice: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Poškozené věty: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Chyby v kontrolním součtu: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Neznámé věty: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Nulové souřadnice: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA import úspěšný" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA import selhal!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -980,5 +945,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Vložit" @@ -1007,5 +972,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Předvolby" @@ -1051,14 +1016,19 @@ msgstr "Otočit cesty" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Uložit aktuální data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1067,26 +1037,26 @@ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Prázdný dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokument neobsahuje žádná data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Přesto uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1096,32 +1066,36 @@ "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Zamítnout konflikty a uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Uložit OSM soubor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Uložit GPX soubor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Uložit OSM soubor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Nemohu zálohovat soubor." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Neznámá přípona souboru." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Během ukládání došlo k chybě." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Během obnovení zálohy došlo k chybě." @@ -1262,55 +1236,55 @@ msgstr "Zapnout/Vypnout globální nastavení ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozpojit cesty" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Zduplikovat uzly používané více cestami." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Jeden otagovaný uzel, nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Jednu cestu s jedním, nebo více uzly používanými ve více než jedné cestě, " +"nebo" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Jednu cestu s jedním, nebo více uzly používanými ve více než jedné cestě, " -"nebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1318,5 +1292,5 @@ "cestě." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1329,9 +1303,9 @@ "své vlastní kopie a všechny uzly budou vybrány." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Nespojený uzel" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1339,5 +1313,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1398,50 +1372,50 @@ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Nahrát do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 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:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objekty k přidání:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objekty ke změnění:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objekty ke smazání:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Nahrát tyto úpravy?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Nahrát změny na server" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Žádné změny k nahrání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1647,14 +1621,14 @@ msgstr "Přidat uzel do cesty a spojit" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Vytvořit nový uzel." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Vybrat uzel pod kurzorem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1664,14 +1638,14 @@ msgstr[2] "Vložit nový uzel do {0} cest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 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:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Pokračovat v cestě od posledního uzlu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Dokončit kreslení" @@ -1691,5 +1665,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 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" @@ -1700,5 +1674,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Pusť myší tlačítko k zastavení otaáčení" @@ -1734,5 +1708,5 @@ msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1740,5 +1714,5 @@ "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1765,16 +1739,16 @@ "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:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1782,148 +1756,158 @@ msgstr "Nebyla načtena žádná data." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1940,15 +1924,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Chybějící argument pro \"NEBO\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Chybějící argument pro \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1983,7 +1997,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Přidat" @@ -2024,4 +2038,8 @@ msgstr "Nastaveno {0}={1} pro {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2029,65 +2047,10 @@ msgstr "Vyřešit {0} konfliktů v {1} objektech" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Smazat {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Smazat {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Konfliktní relace" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Odstranit z relace" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Přesunout" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2100,169 +2063,20 @@ msgstr[2] "uzly" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Odstranit prvek relace" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Otočit" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekvence" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Použít ?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Použít zvolené změny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Neprovádět změny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Vlastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Role v relaci odkazující na" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatická korekce popisků" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, 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:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "různé" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "smazáno" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "pravda" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "nepravda" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "pozice" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Desetinné stupně" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Stupně minuty sekundy" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "J" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "Z" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "nekompletní" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Chyba: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Varování: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "cesta" +msgstr[1] "cesty" +msgstr[2] "cestami" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2275,4 +2089,264 @@ msgstr[2] "relace" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Smazat {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Smazat {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Konfliktní relace" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Přesunout" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Odstranit prvek relace" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Otočit" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekvence" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Použít ?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "různé" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "smazáno" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "pravda" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "nepravda" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "pozice" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Desetinné stupně" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Stupně minuty sekundy" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "J" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "Z" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "nekompletní" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Chyba: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Varování: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2309,139 +2383,129 @@ msgstr[2] "{0} uzlů" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Cesta se stylem plochy není uzavřená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Cesta v multipolygonu ''{0}'' není uzavřena." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Prázdný prvek v relaci." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Odstraněn prvek ''{0}'' z relace." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Cesta ''{0}'' s méně, než dvěmi body." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Nalezena více než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Nalezeno více cílových \"to\" cest." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Nalezen více než jeden \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznámá role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Neznámý typ prvku pro ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Nenazezena příchozí cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Nenalezena odchozí cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Nenalezen \"via\" uzel nebo cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Styl pro omezení {0} nenalezen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ne-cesta ''{0}'' v multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Cesty ''{0}'' a ''{1}'' se protínají." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Vnitřní cesta ''{0}'' je venku." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Styl pro vnější cestu ''{0}'' nesedí." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "nepopsaný" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "cesta" -msgstr[1] "cesty" -msgstr[2] "cestami" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2463,5 +2527,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2499,4 +2563,10 @@ "and start a new layer on the new zone." msgstr "" +"UPOZORNĚNÍ: data umístěna příliš daleko \n" +"od současných hranic zóny Lambertovy kartografické projekce.\n" +"Neposílejte na server žádná data od této hlášky.\n" +"Vraťte zpět poslední akci, uložte svou práci\n" +"a vytvořte novou vrstvu v JOSM s novou zónou Lambertovy \n" +"kartografické projekce.." #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158 @@ -2522,4 +2592,10 @@ "Do not upload any data after this message." msgstr "" +"Kartografická projekce \"{0}\" je použitelná pouze pro\n" +"zeměpisné šířky mezi 45.7° a 47.9°\n" +"a zeměpisné délky mezi 5.7° a 10.6°.\n" +"Použijte jinou projekci v JOSM, pokud nepracujete\n" +"přímo na území Švýcarska nebo Lichtenštejnska.\n" +"Od této zprávy neposílejte na server žádná data." #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138 @@ -2537,4 +2613,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2549,4 +2626,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2756,26 +2834,26 @@ msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2784,21 +2862,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Přepnout drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Zvuk" @@ -2908,4 +2986,493 @@ msgstr "Inicializace" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../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:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Členové" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Odstranit" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Role" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2919,5 +3486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2948,9 +3515,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Vyřešit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2958,25 +3525,69 @@ "seznamu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Spojení konfliktů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Vyřešit konfklikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Varování" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3139,10 +3750,4 @@ msgid "Member Of" msgstr "Člen" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Role" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3330,8 +3935,4 @@ msgstr "Tagy (prázdná hodnota vymaže tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Členové" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3365,11 +3966,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Odstranit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3424,5 +4018,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3447,5 +4041,5 @@ msgstr "ano" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3472,24 +4066,24 @@ msgstr "ne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Členové: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relací: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Vznikly konflikty během importu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Chyba parsování odezvy serveru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Nemohu se připojit na server." @@ -3740,11 +4334,5 @@ #, java-format msgid "Image with path {0} does not exist or is not readable." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Varování" +msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 @@ -3785,5 +4373,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3821,53 +4409,53 @@ msgstr "Zadaný čas nemůže být rozparsován" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps bod" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Přizpůsobit kreslení linií" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Použít globální nastavení." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Nereslit spojnice mezi body v této vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Přizpůsobit barvu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3875,6 +4463,6 @@ msgstr "Výchozí" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3882,31 +4470,31 @@ msgstr "Zvolit barvu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Značky z pojmenovaných bodů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Pojmenované body z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importovat zvuk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave Audiosoubory (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Audio značky z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importovat obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3916,5 +4504,5 @@ msgstr[2] "{0} cesty, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3924,5 +4512,5 @@ msgstr[2] "{0} trasy, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3932,28 +4520,28 @@ msgstr[2] "{0} značek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Jméno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Časové rozpětí: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Délka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Převést do datové vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3964,11 +4552,11 @@ "
Pokud chcete nahrát trasy, podívejte se tady:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3978,29 +4566,29 @@ msgstr "Převedeno z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Stáhnout vše v rozmezí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metrů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4011,9 +4599,9 @@ "pokračovat?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4021,5 +4609,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4038,24 +4626,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} smazáno.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4093,5 +4681,5 @@ msgstr[2] "body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4101,5 +4689,5 @@ msgstr[2] "trasy s {0} body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4109,5 +4697,5 @@ msgstr[2] "{0} se skládá z {1} tras" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4243,5 +4831,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Zvolte řádek k vymazání" @@ -5583,5 +6171,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Aktualizovat" @@ -5593,7 +6181,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5601,4 +6188,8 @@ msgid "Please select an entry." msgstr "Prosím, vyberte položku." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5961,5 +6552,5 @@ msgstr "Neznámý typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5970,15 +6561,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5989,18 +6580,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -6038,8 +6629,53 @@ msgstr "Připravuji data..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX soubory" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Značky z {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Chyba parsování: Chybná struktura GPX dokumentu" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 soubory" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Importované souřadnice: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Poškozené věty: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +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 +msgid "Unknown sentences: " +msgstr "Neznámé věty: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Nulové souřadnice: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA import úspěšný" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA import selhal!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6096,4 +6732,13 @@ msgid "Unknown host" msgstr "Neznámé jméno počítače" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6122,8 +6767,16 @@ msgstr "Přerušuji..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Chyba během parsování" +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "Soubory z OSM serveru" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6167,7 +6820,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Odstraněn prvek ''{0}'' z relace." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6213,5 +6866,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6235,15 +6888,20 @@ "oblast." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Aktualizuj pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Stáhnout pluginy" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6256,23 +6914,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} plugin úspěšně aktualizován. Prosím, restartujte JOSM." -msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM." -msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Nemohu stáhnout plugin: {0} z {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6290,25 +6957,25 @@ "potřebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Následující plugin nenalezen:{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6318,21 +6985,21 @@ "'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Zakázat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Ponechat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6342,5 +7009,5 @@ "jejich přepsání." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6349,10 +7016,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6360,9 +7027,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Chcete plugin zakázat ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6372,5 +7039,5 @@ "programu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6380,19 +7047,19 @@ "JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informace" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "není zádný popis" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6402,13 +7069,13 @@ msgstr[2] "Informace o pluginech staženy z {0} sití" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Nenalezeny informace o pluginu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Všechny nainstalované pluginy jsou aktuální." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6421,9 +7088,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Stáhnout chybějící pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6436,10 +7103,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Stáhnout pluginy" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6462,41 +7125,14 @@ msgstr "neznámý" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verze {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin zahrnut v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Plugin již existuje" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Archiv pluginů je již přítomen. Přejete si stáhnout současnou verzi a " -"odstranit existující archiv?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Smazat a stáhnout" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Chyba při mazání souboru pluginu: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6611,5 +7247,5 @@ #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 msgid "Select two ways with alone a node in common" -msgstr "" +msgstr "Vybrat dvě cesty a bod" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 @@ -6645,9 +7281,4 @@ msgstr "Prosím zadejte popis vaší trasy" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Značky" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6819,4 +7450,9 @@ 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 +#, 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 @@ -7049,6 +7685,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" @@ -7376,37 +8012,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Prázdná vrstva" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS vrstva ({0}), nahráno {1} dlaždic" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Není vektorizovaný." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Je vektorizovaný." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7415,16 +8056,21 @@ msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7435,9 +8081,9 @@ "Vytvořte nový soubor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Chyba formátu cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7445,5 +8091,5 @@ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Chyba Lambertovy zóny v cache" @@ -7484,7 +8130,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Rozdělit cestu" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7918,7 +8563,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "voda" @@ -8065,5 +8710,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82 msgid "Data source text. Default is Landsat." -msgstr "" +msgstr "Text odkazující na použitý zdroj. Implicitně Landsat." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84 @@ -8177,5 +8822,5 @@ #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:75 msgid "Reset current measurement results and delete measurement path." -msgstr "" +msgstr "Zrušit současné měření a smazat měřící cestu." #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:81 @@ -8310,16 +8955,21 @@ msgstr "Neznámý stav problému" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Otevřít viditelné..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Neznámá koncovka souboru: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8411,5 +9061,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8436,25 +9086,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Nejrychlejší" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Obrátit cestu" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Vymazat cestu" @@ -8630,11 +9280,11 @@ msgstr "konec" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Editovat tagy" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Otevřít dialog editoru tagů" @@ -8644,8 +9294,4 @@ msgstr "Plugin pro editaci tagů v JOSM" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8656,5 +9302,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8664,5 +9310,5 @@ msgstr[2] "Odstranit staré klíče z {0} objektů" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8685,8 +9331,14 @@ msgstr "Filtrovat" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Smazat" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9593,7 +10245,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "budova" @@ -9607,5 +10259,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "oblast" @@ -9696,4 +10348,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9771,19 +10439,19 @@ "Toto může vést ke špatným souřadnicím." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatické stahování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9791,17 +10459,17 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alfa kanál" @@ -9815,51 +10483,51 @@ msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Nastavení pluginu WMS Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Jméno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Jméno v menu (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Zadejte jméno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Zkopírovat výchozí" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Vyberte řádek ke zkopírování." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9955,10 +10623,7 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10116,6 +10781,11 @@ "provádí opravy. Zahrnuje kontrolu překlepů pro tagy." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10934,5 +11604,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "soukromý" @@ -10980,5 +11650,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "dopravní obsluha" @@ -11015,5 +11685,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "na povolení" @@ -11245,6 +11915,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "dálnice" @@ -11270,6 +11940,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "4. pruhová silnice" @@ -11295,6 +11965,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "silnice první třídy" @@ -11320,6 +11990,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "silnice druhé třídy" @@ -11333,5 +12003,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "silnice třetí třídy" @@ -11349,5 +12019,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "obytná oblast" @@ -11365,5 +12035,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "obslužná cesta" @@ -11390,6 +12060,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "konstrukce" @@ -11413,5 +12083,5 @@ #: build/trans_presets.java:382 msgid "Ways" -msgstr "Počet pruhů" +msgstr "Cesty" #. group "Ways" @@ -11439,5 +12109,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "kruhový objezd" @@ -12416,5 +13086,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "mokřina" @@ -14138,27 +14808,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -14201,5 +14871,5 @@ #: build/trans_presets.java:1809 build/trans_presets.java:1818 msgid "boules" -msgstr "Hry s koulemy (např. pétanque)" +msgstr "Hry s koulemi (např. pétanque)" #: build/trans_presets.java:1791 build/trans_presets.java:1800 @@ -14746,10 +15416,10 @@ #: build/trans_presets.java:1976 msgid "Boule" -msgstr "Hry s koulemy (např. pétanque)" +msgstr "Hry s koulemi (např. pétanque)" #. item #: build/trans_presets.java:1977 msgid "Edit Boule" -msgstr "Upravit hry s koulemy (např. pétanque)" +msgstr "Upravit hry s koulemi (např. pétanque)" #: build/trans_presets.java:1982 @@ -15019,5 +15689,5 @@ #: build/trans_presets.java:2140 msgid "Arts Centre" -msgstr "komunitní umělecké centrum" +msgstr "Komunitní umělecké centrum" #. item @@ -15042,5 +15712,5 @@ #: build/trans_presets.java:2153 msgid "Place of Worship" -msgstr "Chrám(kostel, kaple, synagoga, mešita...)" +msgstr "Chrám(kostel, synagoga, mešita)" #. item @@ -15174,5 +15844,5 @@ #: build/trans_presets.java:2891 msgid "orthodox" -msgstr "ortodoxní" +msgstr "pravoslavné" #: build/trans_presets.java:2161 build/trans_presets.java:2882 @@ -16659,5 +17329,5 @@ #: build/trans_presets.java:2851 msgid "Common" -msgstr "Obecná přístupná plocha" +msgstr "veřejná zeleň (mimo parky)" #. item @@ -16665,5 +17335,5 @@ #: build/trans_presets.java:2853 msgid "Edit Common" -msgstr "Upravit obecnou přístupnou plochu" +msgstr "Upravit veřejnou zeleň" #. item "Land use/Common" text "Name" @@ -16784,10 +17454,10 @@ #: build/trans_presets.java:2931 msgid "Brownfield" -msgstr "Šedá zóna (nevyužité staré domy)" +msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item #: build/trans_presets.java:2932 msgid "Edit Brownfield Landuse" -msgstr "Upravit šedou zónu (nevyužité staré domy)" +msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" @@ -16804,10 +17474,10 @@ #: build/trans_presets.java:2943 msgid "Landfill" -msgstr "Smetiště" +msgstr "skládka odpadu" #. item #: build/trans_presets.java:2944 msgid "Edit Landfill Landuse" -msgstr "Upravit smetiště" +msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" @@ -16996,8 +17666,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bicykl" @@ -17058,6 +17728,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17068,8 +17736,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "pěší" @@ -17095,5 +17763,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17178,4 +17846,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17190,8 +17859,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17211,5 +17882,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standardní" @@ -17299,7 +17970,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "most" @@ -17563,15 +18234,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "zastaralý" @@ -17613,5 +18284,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "koňská" @@ -17821,11 +18492,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17863,6 +18534,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "ulice" @@ -17918,7 +18589,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "dálnice" @@ -17974,8 +18645,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "železnice" @@ -17996,5 +18667,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -18008,5 +18679,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -18027,5 +18698,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -18040,5 +18711,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18053,5 +18724,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "říční břeh" @@ -18065,5 +18736,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "potok" @@ -18077,5 +18748,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -18103,5 +18774,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18269,13 +18940,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18337,7 +19008,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18360,10 +19031,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18393,6 +19064,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18437,6 +19108,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18450,5 +19121,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminál" @@ -18470,5 +19141,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18482,5 +19153,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18528,7 +19199,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "lanovka" @@ -18545,5 +19216,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "lehká sjezdovka" @@ -18558,5 +19229,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "střední sjezdovka" @@ -18571,5 +19242,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "těžká sjezdovka" @@ -18584,5 +19255,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18597,5 +19268,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18610,5 +19281,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "sjezdovka pro začátečníky" @@ -18713,10 +19384,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18729,8 +19400,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "molo" @@ -18744,5 +19413,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "potrubí" @@ -18870,12 +19539,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18889,5 +19558,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "přísav" @@ -18959,8 +19628,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "občanská vybavenost" @@ -19062,10 +19731,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19451,22 +20120,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19498,6 +20167,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "menší vodní plochy" @@ -19558,8 +20227,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "zdravotnictví" @@ -19912,26 +20581,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "obchod" @@ -20003,8 +20672,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20154,9 +20823,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turistika" @@ -20228,8 +20897,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historické" @@ -20300,8 +20969,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "zeleň" @@ -20315,5 +20984,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "lom" @@ -20327,5 +20996,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "skládka" @@ -20347,5 +21016,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "nádrže" @@ -20359,5 +21028,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "les" @@ -20371,5 +21040,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "zemědělství" @@ -20392,5 +21061,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "obchody" @@ -20404,5 +21073,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "průmysl" @@ -20416,7 +21085,7 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" -msgstr "Šedá zóna (nevyužité staré domy)" +msgstr "stará zátěž, městské ruiny (Brownfield)" #. color brownfield @@ -20428,5 +21097,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "Zastavitelné území (Greenfield)" @@ -20440,5 +21109,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "železniční plochy" @@ -20495,7 +21164,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "vojenský" @@ -20509,5 +21178,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "hřbitov" @@ -20520,5 +21189,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "vrchol" @@ -20533,5 +21202,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "ledovec" @@ -20545,5 +21214,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "sopka" @@ -20598,8 +21267,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "přírodní" @@ -20613,5 +21282,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "křoví" @@ -20625,5 +21294,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "vřesoviště" @@ -20637,5 +21306,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "Prales" @@ -20649,5 +21318,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "bahno" @@ -20661,5 +21330,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "pláž" @@ -20737,8 +21406,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "cesta" @@ -20786,7 +21455,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "hranice" @@ -20928,10 +21597,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "místo" @@ -20979,6 +21648,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adresa" @@ -21209,10 +21878,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21260,4 +21929,30 @@ msgstr "Ulice NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." + +#~ msgid "Commit comment" +#~ msgstr "Poslat komentář" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} plugin úspěšně aktualizován. Prosím, restartujte JOSM." +#~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM." +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21267,7 +21962,4 @@ #~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." -#~ msgid "Commit comment" -#~ msgstr "Poslat komentář" - #~ msgid "Server does not support changesets" #~ msgstr "Server nepodporuje sady změn" @@ -21276,4 +21968,13 @@ #~ 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 "Drawbridge" #~ msgstr "Padací most" @@ -21282,10 +21983,33 @@ #~ msgstr "Opravdu označit tento problém jako \"hotový\"?" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Archiv pluginů je již přítomen. Přejete si stáhnout současnou verzi a " +#~ "odstranit existující archiv?\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "viadukt" +#~ 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 "Delete and Download" +#~ msgstr "Smazat a stáhnout" + #~ msgid "Edit Drawbridge" #~ msgstr "Upravit padací most" @@ -21293,2 +22017,10 @@ #~ msgid "Edit Portcullis" #~ msgstr "Upravit zkratky" + +#~ 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." Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 15801) +++ /applications/editors/josm/i18n/po/da.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-22 15:26+0000\n" -"Last-Translator: Peter Brodersen \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-07 12:55+0000\n" +"Last-Translator: nanker \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:12+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"Projektionen kunne ikke læses fra indstillinger. Bruger EPSG:4326 (WGS84)" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Ugemte ændringer" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Gem og afslut" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Smid væk og afslut" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +102,10 @@ msgstr "Fortryd" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Udvidelser" @@ -254,15 +254,15 @@ msgstr "Længdegrad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Opstil punkter i cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +294,9 @@ msgstr "Værktøj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Nogle af punkterne er (næsten) på linjen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Vælg mindst fire punkter." @@ -330,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -474,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -483,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Fjern" @@ -493,14 +494,15 @@ msgstr "Slet valgte objekter." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Overskriv" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Filen findes allerede. Overskriv?" @@ -528,9 +530,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -568,16 +570,4 @@ msgstr "Afslut programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM-serverfiler" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX-filer" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183-filer" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -651,12 +641,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -664,5 +654,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Fejl" @@ -683,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -800,4 +790,18 @@ msgstr "Foren {0} punkter" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -854,67 +858,25 @@ msgstr "unavngivet" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Åbn..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Åbn en fil" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fejl ved indlæsning {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Ukendt filtype: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markører fra {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Koordinater importeret: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Defekte sætninger: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Fejl ved kontrolsum: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Ukendte sætninger: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Ingen kooordinater: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA-import succesfuld" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Fejl ved NMEAimport!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -985,5 +947,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Sæt ind" @@ -1012,5 +974,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Indstillinger" @@ -1056,14 +1018,19 @@ msgstr "Vend veje om" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Gem" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Gem nuværende data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1073,26 +1040,26 @@ "venligst dette som en fejl." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dette dokument indeholder intet data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Gem alligevel" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1102,32 +1069,36 @@ "håndteret som om, du afviste dem alle. Fortsæt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Afvis konflikter og gem" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Gem OSM-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Gem GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Gem OSM-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Kunne ikke lave backup af fil." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Ukendt filtype." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "En fejl opstod under skrivning." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "En fejl opstod ved gendannelse af backup-fil." @@ -1262,54 +1233,54 @@ msgstr "Skifter den globale indstilling \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Adskil veje" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dublet-punkter, som bruges af flere veje." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Vælg enten:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Et markeret punkt, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* En vej, som har ét eller flere punkter, som benyttes af mere end én vej, " +"eller" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* En vej, som har ét eller flere punkter, som benyttes af mere end én vej, " -"eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1317,5 +1288,5 @@ "vej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1325,9 +1296,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1335,5 +1306,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1394,50 +1365,50 @@ "fortsætte?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Send til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Send alle ændringer til OSM-serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Tilføjede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Ændrede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Slettede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Send disse ændringer?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Send ændringer" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Ingen ændringer at sende." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1643,14 +1614,14 @@ msgstr "Tilføj punkt ind i vej og forbind" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Opret nyt punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Vælg punkt under markøren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1659,14 +1630,14 @@ msgstr[1] "Indsæt nyt punkt i {0} veje." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Start ny vej fra seneste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Fortsæt vej fra seneste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Afslut tegning." @@ -1686,5 +1657,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slip museknappen for at vælge objekterne inden i firkanten." @@ -1695,5 +1666,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Slip museknappen for at stoppe rotationen." @@ -1728,5 +1699,5 @@ msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1735,5 +1706,5 @@ "nærmeste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1756,16 +1727,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1773,146 +1744,156 @@ msgstr "Intet data indlæst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +msgstr "modified - alle ændrede objekter" + +#: ../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:94 +msgstr "selected - alle valgte objekter" + +#: ../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:95 +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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../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:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "Regulært udtryk" @@ -1930,15 +1911,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Mangler argumenter for \"eller\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Mangler argument fro \"ikke\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1973,7 +1984,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Tilføj" @@ -2013,4 +2024,8 @@ msgstr "Sæt {0}={1} for {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2018,65 +2033,10 @@ msgstr "Løs {0} konflikter i {1} objekter" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slet {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slet {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Modstridende relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Slet fra relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Flyt" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2088,168 +2048,19 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Roter" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Udfør?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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 "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:39 -msgid "Apply selected changes" -msgstr "Udfør valgte ændringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Undlad at udføre ændringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Egenskaber for " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatisk tag-rettelse" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Fejl i konfigurationsfilen ved linjerne {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åbne mappen for indstillinger: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "anderledes" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "slettet" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "sand" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falsk" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "position" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "decimalgrader" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grader minutter sekunder" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "Ø" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "ufuldstændig" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Fejl: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Advarsel: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "vej" +msgstr[1] "veje" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2261,4 +2072,263 @@ msgstr[1] "relationer" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Slet {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Slet {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Modstridende relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Flyt" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Roter" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Udfør?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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 "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/ConflictItem.java:34 +msgid "different" +msgstr "anderledes" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "slettet" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "sand" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falsk" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "position" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "decimalgrader" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grader minutter sekunder" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "Ø" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "ufuldstændig" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Fejl: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Advarsel: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2293,138 +2363,129 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "En vej af typen Område er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon-vej \"{0}\" er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Tomt medlem i relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettede medlem \"{0}\" i relation" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vej \"{0}\" med mindre end to punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Mere end én \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Mere end én \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Mere end én \"via\" blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Ukendt rolle \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Ukendt medlemstype for \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Ingen \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Ingen \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Intet \"via\"-punkt eller vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ikke-vej \"{0}\" i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ingen ydre vej for multipolygon \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Indre vej \"{0}\" er på ydersiden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "utagget" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "vej" -msgstr[1] "veje" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2446,5 +2507,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2520,4 +2581,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2532,4 +2594,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2740,26 +2803,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Forudindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2768,21 +2831,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Skift trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Skift fra og til Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Lyd" @@ -2893,4 +2956,493 @@ msgstr "Initialiserer" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Tags" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Fjern" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rolle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2904,5 +3456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2933,9 +3485,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2943,25 +3495,69 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Sammenfletnings-konflikter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Udred konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Løse konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Advarsel" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3122,10 +3718,4 @@ msgid "Member Of" msgstr "Medlem af" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rolle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3309,8 +3899,4 @@ msgstr "Tags (tom værdi fjerner tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Medlemmer" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3344,11 +3930,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Fjern" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3403,5 +3982,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3426,5 +4005,5 @@ msgstr "ja" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3451,24 +4030,24 @@ msgstr "nej" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Medlemmer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relations-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Der var konflikter ved import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Fejl i fortolkning af server-svar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Kan ikke forbinde til serveren." @@ -3725,10 +4304,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Advarsel" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3767,5 +4340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3803,53 +4376,53 @@ msgstr "Den indtastede tid kunne ikke forstås." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Tilpas linjetegning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Brug globale indstillinger." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkter for dette lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Vælg linjetegnings-indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Tilpas farve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3857,6 +4430,6 @@ msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3864,31 +4437,31 @@ msgstr "Vælg en farve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Markører fra navngivne punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Navngivne punkter fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importér lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave-lydfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importér billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3897,5 +4470,5 @@ msgstr[1] "{0} spor, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3904,5 +4477,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3911,28 +4484,28 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Tidshorisont: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Længde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Konvertér til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3943,11 +4516,11 @@ "
Hvis du vil uploade traces, så kig her:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3957,29 +4530,29 @@ msgstr "Konverteret fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Hent fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Hent alt inden for:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3990,10 +4563,10 @@ "du
at fortsætte?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4001,5 +4574,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4016,24 +4589,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4069,5 +4642,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4076,5 +4649,5 @@ msgstr[1] "et spor med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4083,5 +4656,5 @@ msgstr[1] "{0} består af {1} spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4218,5 +4791,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Vælg venligst rækken, der skal slettes" @@ -5559,5 +6132,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Opdater" @@ -5569,11 +6142,14 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Tilføj enten site-josm.xml eller Wiki-sider." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5786,5 +6362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:53 msgid "no modifier" -msgstr "" +msgstr "ingen tilføjelse" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:164 @@ -5946,5 +6522,5 @@ msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5955,15 +6531,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5973,18 +6549,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Ret egenskaber" @@ -6022,8 +6598,53 @@ msgstr "Forbereder data..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX-filer" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markører fra {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183-filer" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Koordinater importeret: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Defekte sætninger: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Fejl ved kontrolsum: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Ukendte sætninger: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Ingen kooordinater: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA-import succesfuld" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Fejl ved NMEAimport!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6080,4 +6701,13 @@ msgid "Unknown host" msgstr "Ukendt vært" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6106,8 +6736,16 @@ msgstr "Afbryder..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM-serverfiler" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6121,5 +6759,5 @@ #, java-format msgid "Unknown version: {0}" -msgstr "" +msgstr "Ukendt version: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 @@ -6151,7 +6789,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Slettede medlem \"{0}\" i relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6198,5 +6836,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6219,15 +6857,20 @@ "igen om kort tid." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Opdater udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Hent udvidelser" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6240,21 +6883,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." -msgstr[1] "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Kunne ikke hente udvidelsen {0} fra {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -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 "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6272,25 +6926,25 @@ "påkrævet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Udvidelse kræver en JOSM-opdatering: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Udvidelsen blev ikke fundet: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6300,21 +6954,21 @@ "indstillingen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Deaktivér udvidelse." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Behold udvidelse" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6324,5 +6978,5 @@ "til at overskrive de eksisterende udvidelser." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6330,10 +6984,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6342,9 +6996,9 @@ "fejlrapport." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Skal udvidelsen deaktiveres?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6354,5 +7008,5 @@ "udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6362,19 +7016,19 @@ "fra, om problemet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Oplysninger" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "Ingen beskrivelse er tilgængelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +msgstr "Flere detaljer" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6383,13 +7037,13 @@ msgstr[1] "Hent udvidelsesinformationer fra {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Ingen udvidelsesinformationer blev fundet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Alle installerede udvidelser er opdaterede." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6402,9 +7056,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Hent manglende udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6417,10 +7071,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Hent udvidelser" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6443,41 +7093,14 @@ msgstr "ukendt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Udvidelse som følger med JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Udvidelsen findes allerede" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Slet og hent" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Fejl ved sletning af udvidelsesfil: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6628,9 +7251,4 @@ msgstr "Indtast en beskrivelse af din sporing." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Tags" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6802,4 +7420,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fejl ved indlæsning {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7031,6 +7654,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" @@ -7146,5 +7769,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" -msgstr "" +msgstr "Kilde" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 @@ -7275,5 +7898,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 msgid "Zone" -msgstr "" +msgstr "Zone" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 @@ -7352,36 +7975,41 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Tomt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" msgstr "" @@ -7391,16 +8019,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +msgstr "Fil format fejl" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7409,14 +8042,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7457,7 +8090,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Opdel vej" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7532,13 +8164,13 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81 msgid "Position only" -msgstr "" +msgstr "Kun position" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82 msgid "Position, Time, Date, Speed" -msgstr "" +msgstr "Position, tid, dato, hastighed" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83 msgid "Position, Time, Date, Speed, Altitude" -msgstr "" +msgstr "Position, tid, dato, hastighed, højde" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85 @@ -7584,5 +8216,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86 msgid "Port:" -msgstr "" +msgstr "Port:" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94 @@ -7594,5 +8226,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100 msgid "refresh the port list" -msgstr "" +msgstr "opdatér port liste" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108 @@ -7888,7 +8520,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "vand" @@ -7960,5 +8592,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66 msgid "Source text" -msgstr "" +msgstr "Kilde tekst" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 @@ -8267,16 +8899,21 @@ msgstr "Ukendt status for fejlrapport" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Åbn synlig..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Ukendt filtype: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8365,5 +9002,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8390,25 +9027,25 @@ msgstr "Åbn en liste af punkter i ruteplanen" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Tilføj ruteplan-lag" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Kriterier" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Korteste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Hurtigste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Vend ruten om" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Fjern rute" @@ -8460,9 +9097,9 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Increase zoom" -msgstr "" +msgstr "Øg zoom" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122 msgid "Decrease zoom" -msgstr "" +msgstr "Reducer zoom" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466 @@ -8472,5 +9109,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 msgid "autozoom" -msgstr "" +msgstr "autozoom" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30 @@ -8581,11 +9218,11 @@ msgstr "slut" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8594,8 +9231,4 @@ msgid "JOSM Tag Editor Plugin" msgstr "" - -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "ingen" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -8607,5 +9240,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8614,5 +9247,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8623,9 +9256,9 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" -msgstr "" +msgstr "Gruppe" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24 msgid "Item" -msgstr "" +msgstr "Emne" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 @@ -8634,7 +9267,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "Ryd" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -8699,17 +9338,17 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:447 msgid "Even" -msgstr "" +msgstr "Lige" #: ../plugins/terracer/src/terracer/TerracerAction.java:424 msgid "Odd" -msgstr "" +msgstr "Ulige" #: ../plugins/terracer/src/terracer/TerracerAction.java:482 msgid "Highest number" -msgstr "" +msgstr "Højeste nummer" #: ../plugins/terracer/src/terracer/TerracerAction.java:483 msgid "Lowest number" -msgstr "" +msgstr "Laveste nummer" #: ../plugins/terracer/src/terracer/TerracerAction.java:484 @@ -8812,17 +9451,17 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217 msgid "Added node on all intersections" -msgstr "" +msgstr "Tilføjede punkter ved alle kryds" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241 msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" +msgstr "Slet veje, som ikke er en del af en indre multipolygon" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246 msgid "Fix relations" -msgstr "" +msgstr "Ret relationer" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251 msgid "Joined self-overlapping area" -msgstr "" +msgstr "Sammenlagde selv-overlappende område" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252 @@ -8842,21 +9481,21 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480 msgid "Removed Element from Relations" -msgstr "" +msgstr "Fjernede element fra relationer" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589 msgid "Join Areas: Remove Short Ways" -msgstr "" +msgstr "Sammenlæg områder: Fjern korte veje" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605 msgid "Closed Way" -msgstr "" +msgstr "Lukket vej" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872 msgid "Remove tags from inner ways" -msgstr "" +msgstr "Fjern tags fra indre veje" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901 msgid "Join Areas Function" -msgstr "" +msgstr "Funktion til sammenlægning af områder" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 @@ -8951,9 +9590,9 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72 msgid "Use ignore list." -msgstr "" +msgstr "Brug ignorerings-listen." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73 msgid "Use the ignore list to suppress warnings." -msgstr "" +msgstr "Brug ignorerings-listen til at undlade advarsler." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76 @@ -9306,5 +9945,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Use complex property checker." -msgstr "" +msgstr "Brug kompleks egenskabs-tjekker." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 @@ -9536,7 +10175,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "bygning" @@ -9550,5 +10189,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "område" @@ -9640,4 +10279,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9736,19 +10391,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatisk download" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9757,17 +10412,17 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9775,5 +10430,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "WMS" -msgstr "" +msgstr "WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 @@ -9781,51 +10436,51 @@ msgstr "Åbn et tomt WMS-lag for at hente data fra en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Indstillinger for WMS-udvidelse" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Navn på menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Navn på menu (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS-URL (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Kopier standardværdi" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Vælg venligst rækken, som skal kopieres." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9915,7 +10570,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10071,9 +10725,15 @@ "for de mest udbredte. Stavekontrol er indbygget for tag-navne." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" +"Vis georefererede billeder i baggrunden af JOSM (WMS-servere, Yahoo, ...)." #. -#. #. color foot #. @@ -17022,8 +17680,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "fod" @@ -17031,5 +17689,5 @@ #: build/trans_presets.java:2993 msgid "hiking" -msgstr "" +msgstr "vandre" #: build/trans_presets.java:2993 @@ -17039,5 +17697,5 @@ #: build/trans_presets.java:2993 msgid "detour" -msgstr "" +msgstr "omvej" #. color otherrail @@ -17049,5 +17707,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "undergrundsbane" @@ -17056,5 +17714,5 @@ #: build/trans_presets.java:2996 msgid "Symbol description" -msgstr "" +msgstr "Symbol beskrivelse" #. item "Relations/Route" text "Description" @@ -17062,10 +17720,10 @@ #: build/trans_presets.java:2999 msgid "Network" -msgstr "" +msgstr "Netværk" #. item "Relations/Route" combo "State" #: build/trans_presets.java:3001 msgid "proposed" -msgstr "" +msgstr "foreslået" #: build/trans_presets.java:3001 @@ -17075,9 +17733,9 @@ #: build/trans_presets.java:3001 msgid "temporary" -msgstr "" +msgstr "midlertidig" #: build/trans_presets.java:3001 msgid "connection" -msgstr "" +msgstr "forbindelse" #: build/trans_presets.java:3002 @@ -17132,4 +17790,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17144,8 +17803,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17165,5 +17826,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17253,7 +17914,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "bro" @@ -17517,15 +18178,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17567,5 +18228,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "hest" @@ -17775,11 +18436,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17817,8 +18478,8 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" -msgstr "" +msgstr "gade" #. color street @@ -17872,7 +18533,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17928,8 +18589,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "bane" @@ -17950,5 +18611,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17962,5 +18623,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17981,5 +18642,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17994,5 +18655,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18007,5 +18668,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "flodbred" @@ -18019,5 +18680,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "" @@ -18031,5 +18692,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -18057,5 +18718,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "akvædukt" @@ -18223,13 +18884,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "menneskeskabt" @@ -18291,7 +18952,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18314,10 +18975,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18347,6 +19008,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18391,6 +19052,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18404,7 +19065,7 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" -msgstr "" +msgstr "terminal" #. color terminal @@ -18424,5 +19085,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18436,5 +19097,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18482,7 +19143,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18499,5 +19160,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18512,5 +19173,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18525,5 +19186,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18538,5 +19199,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18551,5 +19212,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18564,5 +19225,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18667,10 +19328,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18683,8 +19344,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "" @@ -18698,5 +19357,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "rørledning" @@ -18824,12 +19483,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "rekreation" @@ -18843,7 +19502,7 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" -msgstr "" +msgstr "marina" #. color leisure @@ -18913,8 +19572,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -19016,10 +19675,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19405,22 +20064,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19452,6 +20111,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19512,8 +20171,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "helbred" @@ -19866,26 +20525,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "butik" @@ -19957,8 +20616,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20108,9 +20767,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turisme" @@ -20182,8 +20841,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historisk" @@ -20254,8 +20913,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20269,5 +20928,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "stenbrud" @@ -20281,5 +20940,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20301,5 +20960,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20313,5 +20972,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "skov" @@ -20325,5 +20984,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20346,5 +21005,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20358,5 +21017,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industri" @@ -20370,5 +21029,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20382,5 +21041,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20394,5 +21053,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20449,7 +21108,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "militær" @@ -20463,5 +21122,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "kirkegård" @@ -20474,5 +21133,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "" @@ -20487,5 +21146,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "gletsjer" @@ -20499,5 +21158,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulkan" @@ -20552,8 +21211,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20567,5 +21226,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "buskads" @@ -20579,5 +21238,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "hede" @@ -20591,7 +21250,7 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" -msgstr "" +msgstr "træ" #. color water @@ -20603,5 +21262,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "" @@ -20615,5 +21274,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "strand" @@ -20691,8 +21350,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20740,7 +21399,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "grænse" @@ -20882,10 +21541,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "sted" @@ -20933,6 +21592,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adresse" @@ -21163,10 +21822,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Åbn luftkort" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21186,20 +21845,20 @@ #: build/trans_wms.java:14 msgid "YAHOO (GNOME)" -msgstr "" +msgstr "YAHOO (GNOME)" #. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout #: build/trans_wms.java:15 msgid "YAHOO (GNOME Fix)" -msgstr "" +msgstr "YAHOO (GNOME Fix)" #. yahoo://gnome-web-photo-fixed {0} #: build/trans_wms.java:16 msgid "YAHOO (WebKit)" -msgstr "" +msgstr "YAHOO (WebKit)" #. yahoo://webkit-image {0} #: build/trans_wms.java:17 msgid "YAHOO (WebKit GTK)" -msgstr "" +msgstr "YAHOO (WebKit GTK)" #. yahoo://webkit-image-gtk {0} @@ -21213,4 +21872,31 @@ msgid "Streets NRW Geofabrik.de" msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider." + +#~ msgid "Commit comment" +#~ msgstr "Indsend kommentar" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." +#~ msgstr[1] "" +#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" #~ msgid "" @@ -21221,7 +21907,4 @@ #~ "flyt musen. Vælg: Klik" -#~ msgid "Commit comment" -#~ msgstr "Indsend kommentar" - #~ msgid "Server does not support changesets" #~ msgstr "Serveren undersøtter ikke rettesæt" @@ -21230,4 +21913,13 @@ #~ 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 "Drawbridge" #~ msgstr "Vindebro" @@ -21239,7 +21931,26 @@ #~ msgstr "Faldgitter" +#~ 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 "" +#~ "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 "viaduct" #~ msgstr "viadukt" +#~ msgid "Delete and Download" +#~ msgstr "Slet og hent" + #~ msgid "Edit Drawbridge" #~ msgstr "Ret en vindebro" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 15801) +++ /applications/editors/josm/i18n/po/de.po (revision 15802) @@ -9,7 +9,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-23 22:35+0200\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-09 16:20+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" "MIME-Version: 1.0\n" @@ -17,8 +17,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:15+0000\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../core/src/org/openstreetmap/josm/Main.java:187 +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -26,12 +26,12 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:259 +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" @@ -39,56 +39,59 @@ "Merkartor" -#: ../core/src/org/openstreetmap/josm/Main.java:347 +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +msgstr "" +"Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." + +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Ungesicherte Änderungen" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und fortfahren?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Speichern und Beenden" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Verwerfen und Beenden" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -96,5 +99,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -103,10 +106,10 @@ msgstr "Abbrechen" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -190,5 +193,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Plugins" @@ -255,15 +258,15 @@ msgstr "Längengrad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Knotenpunkte im Kreis anordnen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Gewählte Punkte in einem Kreis anordnen." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -272,8 +275,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -294,9 +298,9 @@ msgstr "Werkzeug: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Einige der Knoten sind (fast) in einer Linie" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Bitte mindestens vier Knotenpunkte auswählen." @@ -331,5 +335,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "Konflikt" @@ -477,5 +481,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -486,7 +490,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Entfernen" @@ -496,14 +500,15 @@ msgstr "Ausgewählte Objekte löschen." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Überschreiben" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Datei existiert bereits. Überschreiben?" @@ -531,9 +536,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -571,16 +576,4 @@ msgstr "Programm beenden" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM-Server-Dateien" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX-Dateien" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183-Dateien" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -654,12 +647,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -667,5 +660,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Fehler" @@ -686,5 +679,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -803,4 +796,18 @@ msgstr "{0} Knotenpunkte vereinigen" +#: ../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:70 +msgid "Mirror" +msgstr "Spiegeln" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "Gewählte Knotenpunkte und Wege spiegeln." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Bitte mindestens einen Weg oder Knoten wählen." + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -857,67 +864,25 @@ msgstr "unbenannt" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Öffnen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Datei öffnen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fehler beim Einlesen von {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Dateiendung unbekannt: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Wegpunkte von {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Importierte Koordinaten: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Ungültige Datensätze: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Prüfsummenfehler: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Unbekannte Datensätze: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Leere Koordinaten: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA-Einlesen erfolgreich" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA-Einlesen fehlgeschlagen!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -965,9 +930,11 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 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." +msgstr "" +"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." +msgstr "" +"Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 @@ -991,5 +958,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Einfügen" @@ -1018,5 +985,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Einstellungen" @@ -1062,14 +1029,19 @@ msgstr "Richtung des Weges drehen" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Aktuelle Daten speichern." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Datei {0} existiert bereits. Überschreiben?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1079,26 +1051,26 @@ "no layer.\"" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Leeres Dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Das Dokument enthält keine Daten." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Trotzdem speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikte" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1108,32 +1080,36 @@ "Sollen alle Konflikte abgewiesen werden?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Konflikte abweisen und speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "OSM-Datei speichern" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "GPX-Datei speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "OSM-Datei speichern" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Ebene speichern" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Sicherung der Datei konnte nicht erstellt werden." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Dateiendung unbekannt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Beim Speichern ist ein Fehler aufgetreten." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten." @@ -1168,5 +1144,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 msgid "Show status report with useful information that can be attached to bugs" -msgstr "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" +msgstr "" +"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 @@ -1275,42 +1252,42 @@ msgstr "Globale Einstellung \"{0}\" umschalten." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Wege trennen" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "Dieser Knoten ist mit nichts verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Bitte wählen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Ein Knoten mit Merkmalen, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1318,17 +1295,19 @@ "oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* 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:116 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" "* Einen Weg, der einen oder mehr Knoten hat, die von mehr als einem Weg " "verwendet werden, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "* 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:117 +msgid "" +"* One way and one or more of its nodes that are used by more than one way." msgstr "" "* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg verwendet " "werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1342,9 +1321,9 @@ "und alle Knoten werden ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Knotenpunkte getrennt" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1352,5 +1331,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1394,8 +1373,10 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" +msgstr "" +"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71 -msgid "No data to update found. Have you already opened or downloaded a data layer?" +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 " @@ -1407,52 +1388,53 @@ "This action will require {0} individual download requests. Do you wish to " "continue?" -msgstr "Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?" - +msgstr "" +"Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Zum OSM-Server hochladen..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Alle Änderungen zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Neue Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Geänderte Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Diese Änderungen hochladen?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Änderungen hochladen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1658,14 +1640,14 @@ msgstr "Knotenpunkt in einen Weg einfügen und verbinden" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Einen neuen Knoten erstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Knoten unter Mauszeiger wählen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1674,14 +1656,14 @@ msgstr[1] "Neuen Knoten in {0} Wege einfügen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Neuen Weg an letztem Knoten beginnen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Weg am letzten Knoten fortsetzen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Zeichnen beenden." @@ -1701,5 +1683,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen." @@ -1707,8 +1689,9 @@ #: ../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." +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:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Maustaste loslassen, um das Drehen zu stoppen." @@ -1745,11 +1728,12 @@ msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 +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:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1776,16 +1760,16 @@ "runter, rechts; Zoom verschieben mit rechter Maus" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1793,29 +1777,29 @@ msgstr "Keine Daten geladen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -1823,114 +1807,137 @@ "Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../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:84 +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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "Spezialsuchen:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 -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:97 -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:98 +#: ../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:99 +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:100 +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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1947,15 +1954,50 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Unerwartete Daten: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Fehlendes Argument für 'OR'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Fehlendes Argument für 'NICHT'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +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:595 +#, 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:602 +#, 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:33 @@ -1990,7 +2032,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Hinzufügen" @@ -2030,4 +2072,8 @@ msgstr "{0}={1} setzen für {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ÄndereRelationsElementRolle" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2035,65 +2081,10 @@ msgstr "{0} Konflikte in {1} Objekten auflösen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} löschen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} löschen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Konflikt mit Relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Aus der Relation entfernen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Verschieben" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2105,169 +2096,19 @@ msgstr[1] "Knotenpunkte" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "EntferneRelationsElement" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Drehen" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Abfolge" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Anwenden?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Ausgewählte Änderungen anwenden" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Änderungen nicht anbringen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Eigenschaften von " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Rollen in Relationen beziehen sich auf" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatische Merkmalskorrektur" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "unterschiedlich" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "gelöscht" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "wahr" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falsch" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "Position" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Dezimalgrad" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grad Minuten Sekunden" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "W" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "unvollständig" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Fehler: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Warnung: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "Weg" +msgstr[1] "Wege" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2279,4 +2120,264 @@ msgstr[1] "Relationen" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, 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:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "Kann unentschiedenen Konflikt nicht auflösen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "{1} {0} löschen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "{0} {1} löschen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Konflikt mit Relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, 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:118 +msgid "Move" +msgstr "Verschieben" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "EntferneRelationsElement" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Drehen" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Abfolge" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, 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/VersionConflictResolveCommand.java:57 +#, 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:52 +#, 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/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Anwenden?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "unterschiedlich" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "gelöscht" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "wahr" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falsch" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "Position" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Dezimalgrad" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grad Minuten Sekunden" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "W" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "unvollständig" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Fehler: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Warnung: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2311,138 +2412,129 @@ msgstr[1] "{0} Knoten" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Flächenförmiger Weg ist nicht geschlossen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Leeres Element in der Relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Gelöschtes Element ''{0}'' in der Relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Weg ''{0}'' mit weniger als zwei Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Mehr als ein Weg mit \"from\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Mehr als ein Weg mit \"to\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Mehr als ein Element mit \"via\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Unbekannte Role \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unbekannter Elementtyp für \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Kein \"from\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Kein \"to\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Kein \"via\"-Knoten oder Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Nicht-Weg ''{0}'' im Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Kein äußerer Weg im Multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Innerer Weg \"{0}\" ist außerhalb." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "Ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "Text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "Weg" -msgstr[1] "Wege" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2464,5 +2556,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2549,4 +2641,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2561,4 +2654,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2774,26 +2868,26 @@ msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2802,21 +2896,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Drahtdarstellung" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Drahtdarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Vollbild" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Vollbilddarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2914,5 +3008,6 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96 -msgid "partial: different selected objects have different values, do not change" +msgid "" +"partial: different selected objects have different values, do not change" msgstr "" "teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht " @@ -2926,4 +3021,520 @@ msgid "Initializing" msgstr "Initialisieren" + +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "Meine mit Deren" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "Meine mit Vereinigt" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "Deren mit Vereinigt" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "Eigenschaften" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Merkmale" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "Knoten" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Mitglieder" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "Merkmale({0} Konflikte)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, 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:104 +msgid "Nodes(resolved)" +msgstr "Knoten(gelöst)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgid "" +"Merged node list frozen. No pending conflicts in the node list of this way" +msgstr "" +"Vereinigte Knotenliste fixiert. Keine verbleibenden Konflikte in der " +"Knotenliste des Weges." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +msgid "Nodes(with conflicts)" +msgstr "Knoten(mit Konflikten)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +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:113 +msgid "Members(resolved)" +msgstr "Elemente(gelöst)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +msgid "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" +msgstr "" +"Vereinigte Elementenliste fixiert. Keine verbleibenden Konflikte in der " +"Elementenliste der Relation." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +msgid "Members(with conflicts)" +msgstr "Elemente(mit Konflikten)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +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:125 +msgid "No pending property conflicts" +msgstr "Keine verbleibenden Eigenschaftskonflikte" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "Eigenschaften(mit Konflikten)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "Verbleibende Eigenschaftskonflikte zu beheben" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "Konfliktlösung" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "Parameter \"index\" hat unerwarteten Wert {0}." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "Element {0} nicht in der Liste gefunden" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "Synchron Rollen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "Vergleichen " + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "Meine Version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "Liste der Elemente in meinem (dem lokalen) Datensatz" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "Vereinigte Version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" +"Liste der vereinigten Elemente. Die Liste mit meinen Elementen wird " +"hierdurch ersetzt, wenn die Änderungen bestätigt werden." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "Deren Version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "Liste der Elemente in deren (dem Server-) Datensatz" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "> Kopf" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" +"Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "> Fuß" + +#: ../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 "" +"Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" +"Kopiere meine gewählten Elemente vor das erste ausgewählte Element der Liste " +"vereinigter Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" +"Kopiere meine gewählten Elemente hinter das erste ausgewählte Element der " +"Liste vereinigter Elemente." + +#: ../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 "" +"Kopiere meine gewählten Elemente an den Anfang der Liste vereinigter " +"Elemente." + +#: ../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 "" +"Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" +"Kopiere deren gewählten Elemente vor das erste ausgewählte Element der Liste " +"vereinigter Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" +"Kopiere das ausgewählte Elemente der Server-Daten unter das gewählte Element " +"der vereinigten Liste." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "Hoch" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "Den ausgewählten Eintrag eine Position nach oben schieben." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "Runter" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "Den ausgewählten Eintrag eine Position nach unten schieben." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" +"Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "Fixieren" + +#: ../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 "Aktuelle Liste der vereinigten Elemente fixieren." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +msgstr "Fixierung aufheben" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 +msgid "Unfreeze the list of merged elements and start merging" +msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "Wähle {0} um das Vereinigen zu beginnen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" +"Wähle {0} um das Vereinigen abzuschließen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "Meine Version ({0} Eintrag)" +msgstr[1] "Meine Version ({0} Einträge)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "Vereinigte Version ({0} Eintrag)" +msgstr[1] "Vereinigte Version ({0} Einträge)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "Deren Version ({0} Eintrag)" +msgstr[1] "Deren Version ({0} Einträge)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "Parameter \"{0}\" darf nicht NULL sein." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" +"Anpassung {0} ist noch nicht registriert. Kann Teilnahme in synchronisierter " +"Anpassung nicht setzen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "Anpassung {0} ist noch nicht registriert." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "Knoten" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht " +"ausgeführt werden." + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "Unerwarteter Spaltenindex ({0})" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +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:83 +msgid "" +"Properties in the merged element. They will replace properties in my " +"elements when merge decisions are applied." +msgstr "Vereinigte Merkmale werden die lokalen nach der Übernahme ersetzen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +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:102 +msgid "Coordinates:" +msgstr "Koordinaten:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "Löschstatus:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "nicht gelöscht" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "Behalte meine Koordinaten" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "Behalte Server-Koordinaten" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "Behalte den Löchstatus der lokalen Daten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "Behalte den Löchstatus der Server-Daten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted state" +msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." + +#. 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rolle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "Objekt" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht " +"ausgeführt werden." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "Vereinigte Daten beinhalten keine Merkmale mit dem Schlüssel {0}." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "Lokale Daten beinhalten keine Merkmale mit dem Schlüssel {0}." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "Kann unentschiedenes Merkmalselement nicht anwenden" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "Meine Version (lokale Daten)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "Deren Version (Serverdaten)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr ">" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "Unentschieden" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "Markiere das gewählte Merkmal als unentschieden" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "Server-Daten beinhalten keine Merkmale mit dem Schlüssel {0}." #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -2938,5 +3549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2963,38 +3574,87 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 -msgid "Set the selected elements on the map to the selected items in the list above." +msgid "" +"Set the selected elements on the map to the selected items in the list above." msgstr "" "Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten " "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Konflikte auflösen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = " + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Konflikte lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikte: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "Konflikte auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +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:164 +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:165 +msgid "Apply Resolution" +msgstr "Lösung anwenden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "Unvollständiges anwenden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "Weiter auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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 "" +"Es sind noch nicht alle Konflikte gelöst!
Wähle {0} um die bereits aufgelösten Konflikte anzuwenden.
(Alle übrigen " +"Konflikte können später behoben werden)
Wähle {1} um zum " +"Dialog zurückzukehren." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Warnung" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3156,10 +3816,4 @@ msgid "Member Of" msgstr "Mitglied von" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rolle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3290,5 +3944,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208 -msgid "Close this panel. You can reopen it with the buttons in the left toolbar." +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" "Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken " @@ -3346,8 +4001,4 @@ msgstr "Merkmale (leerer Wert löscht das Merkmal)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Mitglieder" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3364,5 +4015,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:241 msgid "Add all currently selected objects as members" -msgstr "Alle ausgewählten Objekte als Mitglieder hinzufügen" +msgstr "Alle ausgewählten Objekte als Elemente hinzufügen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247 @@ -3380,16 +4031,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254 msgid "Move the currently selected members down" -msgstr "Ausgewählte Mitglieder nach unten schieben" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Entfernen" +msgstr "Ausgewählte Elemente nach unten schieben" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 msgid "Remove the member in the current table row from this relation" -msgstr "Mitglied in der gewählten Tabellenzeile aus dieser Relation entfernen." +msgstr "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 @@ -3440,5 +4084,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3463,5 +4107,5 @@ msgstr "ja" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3488,24 +4132,24 @@ msgstr "nein" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Mitglieder: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relationseditor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Es sind Konflikte beim Importieren aufgetreten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Fehler beim Parsen der Serverantwort." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Kann nicht mit Server verbinden." @@ -3762,10 +4406,4 @@ msgstr "Bild mit Pfad {0} existiert nicht oder ist nicht lesbar." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Warnung" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3804,5 +4442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3840,53 +4478,53 @@ msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "GPS-Punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Linienaussehen anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Globale Einstellungen verwenden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "Linien zwischen Punkten dieser Ebene zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Linienaussehen wählen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Farben anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3894,6 +4532,6 @@ msgstr "Voreinstellung" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3901,31 +4539,31 @@ msgstr "Farbe auswählen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Marken von benannten Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Benannte GPS-Punkte von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Audio importieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Audio-Dateien im Wave-Format (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Audio-Marken von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Bilder importieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3934,5 +4572,5 @@ msgstr[1] "{0} GPS-Spuren, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3941,5 +4579,5 @@ msgstr[1] "{0} Routen, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3948,28 +4586,28 @@ msgstr[1] "{0} Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Beschreibung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Zeitspanne: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Länge: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Zur Daten-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3980,11 +4618,11 @@ "
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3994,29 +4632,29 @@ msgstr "Konvertiert von: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} Meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4027,5 +4665,5 @@ "fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -4033,5 +4671,5 @@ "werden kann." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4041,5 +4679,5 @@ "wurden ignoriert oder an den Anfang verschoben." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4058,24 +4696,24 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} gelöscht.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4111,5 +4749,5 @@ msgstr[1] "Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4118,5 +4756,5 @@ msgstr[1] "Eine GPS-Spur mit {0} Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4125,5 +4763,5 @@ msgstr[1] "{0} besteht aus {1} GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4154,5 +4792,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 -msgid "You need to pause audio at the moment when you hear your synchronization cue." +msgid "" +"You need to pause audio at the moment when you hear your synchronization cue." msgstr "" "Sie müssen die Tonwiedergabe auf Pause stellen, sobald Sie Ihren " @@ -4246,5 +4885,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88 msgid "Default value currently unknown (setting has not been used yet)." -msgstr "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)." +msgstr "" +"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)." #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:187 @@ -4265,5 +4905,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Bitte wählen Sie die zu löschende Zeile." @@ -4308,5 +4948,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 msgid "Start of track (will always do this if no other markers available)." -msgstr "GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)." +msgstr "" +"GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46 @@ -4326,5 +4967,6 @@ "Put text labels against audio (and image and web) markers as well as their " "button icons." -msgstr "Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften." +msgstr "" +"Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61 @@ -4376,5 +5018,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97 msgid "The amount by which the speed is multiplied for fast forwarding" -msgstr "Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird" +msgstr "" +"Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98 @@ -5459,5 +6102,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 -msgid "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." +msgid "" +"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "" "Maximallänge zum Linienzeichnen (in Meter). Verwenden Sie \"-1\", um alle " @@ -5470,5 +6114,6 @@ #. forceRawGpsLines #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110 -msgid "Force drawing of lines if the imported data contain no line information." +msgid "" +"Force drawing of lines if the imported data contain no line information." msgstr "" "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-" @@ -5491,5 +6136,6 @@ "Don't draw arrows if they are not at least this distance away from the last " "one." -msgstr "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben." +msgstr "" +"Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 @@ -5627,5 +6273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Aktualisieren" @@ -5637,7 +6283,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Bitte entweder site-josm.xml oder Wiki-Seiten hinzufügen." +msgid "Add JOSM Plugin description URL." +msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5645,4 +6290,8 @@ msgid "Please select an entry." msgstr "Bitte einen Eintrag wählen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "JOSM-Pluginbeschreibungsdatei ändern." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5738,5 +6387,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "Login password to the OSM account. Leave blank to not store any password." +msgid "" +"Login password to the OSM account. Leave blank to not store any password." msgstr "" "Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden " @@ -5931,5 +6581,6 @@ "

The pseudo-modifier 'disabled' will disable the shortcut when encountered." "

" -msgstr "

Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.

" +msgstr "" +"

Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.

" #. scroll up @@ -6001,5 +6652,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384 msgid "More information about this feature" -msgstr "Mehr Informationen zu diesem Feature" +msgstr "Mehr Informationen zu dieser Vorlage" #. space @@ -6027,5 +6678,5 @@ msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6036,15 +6687,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Einlesen von {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6054,18 +6705,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -6103,7 +6754,52 @@ msgstr "Daten werden vorbereitet...." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX-Dateien" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Wegpunkte von {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183-Dateien" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Importierte Koordinaten: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Ungültige Datensätze: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Prüfsummenfehler: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Unbekannte Datensätze: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Leere Koordinaten: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA-Einlesen erfolgreich" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA-Einlesen fehlgeschlagen!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6164,4 +6860,13 @@ msgstr "Rechner unbekannt" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "OSM-Server-Dateien (bzip2-komprimiert)" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "Ungültige bz2-Datei." + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6189,8 +6894,16 @@ msgstr "Abbrechen..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "OSM-Server-Dateien (gzip-komprimiert)" + #: ../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 +msgid "OSM Server Files" +msgstr "OSM-Server-Dateien" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6226,5 +6939,6 @@ #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -msgstr "Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" +msgstr "" +"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 @@ -6236,5 +6950,7 @@ #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der Relation {1}" +msgstr "" +"Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " +"Relation {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6248,6 +6964,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308 #, java-format -msgid "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" -msgstr "Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID {0}" +msgid "" +"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" +msgstr "" +"Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 @@ -6264,5 +6982,6 @@ #, 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" +msgstr "" +"Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485 @@ -6279,5 +6998,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6289,5 +7008,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 -msgid "Couldn't connect to the osm server. Please check your internet connection." +msgid "" +"Couldn't connect to the osm server. Please check your internet connection." msgstr "" "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre " @@ -6302,15 +7022,20 @@ "kleineren Ausschnitt zu laden oder versuchen Sie es nach einiger Zeit erneut." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Plugins aktualisieren" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Plugins herunterladen" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6323,22 +7048,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} Plugin erfolgreich aktualisiert. Bitte JOSM neu starten." -msgstr[1] "{0} Plugins erfolgreich aktualisiert. Bitte JOSM neu starten." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Kann das Plugin {0} nicht von {1} laden" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "{0} Plugin erfolgreich heruntergeladen. JOSM bitte neustarten." +msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "Plugin {0} herunterladen..." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch " -"heruntergeladen werden." +msgid "Skip download" +msgstr "Herunterladen überspringen" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, 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:119 +msgid "Download Plugin" +msgstr "Plugin herunterladen" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "Herunterladen überspringen" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6356,25 +7091,25 @@ "mehr benötigt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Plugin benötigt JOSM-Aktualisierung: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, 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 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nicht gefunden: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6384,21 +7119,22 @@ "Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Plugin abschalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +msgstr "" +"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Plugin behalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6408,27 +7144,29 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#, java-format -msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 +#, java-format +msgid "" +"An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" "Eine unvorhergesehene Fehlersituation trat auf, die das Plugin \"{0}\" " "ausgelöst haben könnte." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 -msgid "Try updating to the newest version of this plugin before reporting a bug." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +msgid "" +"Try updating to the newest version of this plugin before reporting a bug." msgstr "" "Versuchen Sie zuerst eine Aktualisierung auf die neueste Version des " "Plugins, bevor Sie den Fehler melden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Soll das Plugin abgeschaltet werden?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6438,5 +7176,5 @@ "um das Plugin zu entfernen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6446,19 +7184,19 @@ "Verwaltern Ihres JOSM-Pakets." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "keine Beschreibung verfügbar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Mehr Details" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6467,13 +7205,13 @@ msgstr[1] "Plugin-Informationen von {0} Quellen geladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Keine Plugin-Informationen gefunden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Alle installierten Plugins sind aktuell." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6486,9 +7224,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Fehlende Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6501,10 +7239,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Plugins herunterladen" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6527,41 +7261,14 @@ msgstr "unbekannt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin mit JOSM ausgeliefert" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Das Plugin ist bereits vorhanden" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Das Plugin ist bereits vorhanden. Wollen Sie das aktuelle Plugin löschen und " -"danach erneut herunterladen?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Löschen und Herunterladen" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Fehler beim Löschen des Plugins: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6716,9 +7423,4 @@ msgstr "Bitte Beschreibung für die GPS-Spur angeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Merkmale" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6748,5 +7450,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 msgid "Upload failed. Server returned the following message: " -msgstr "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " +msgstr "" +"Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305 @@ -6890,4 +7593,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fehler beim Einlesen von {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7048,5 +7756,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 -msgid "The selected GPX track doesn't contain timestamps. Please select another one." +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" "Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine " @@ -7124,6 +7833,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" @@ -7243,5 +7952,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" -msgstr "Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" +msgstr "" +"Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 @@ -7300,5 +8010,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" -msgstr "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird" +msgstr "" +"Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7464,37 +8175,42 @@ "Bitte eine auswählen und erneut versuchen." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Leere Ebene" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Ist nicht vektorisiert." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Rasterzentrum: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Ist vektorisiert." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Kommunen-Koordinatenfenster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "WMS-Ebene speichern" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7503,16 +8219,21 @@ msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "WMS-Ebene laden" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7524,9 +8245,9 @@ "Erzeuge eine neue Datei." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Zwischenspeicher-Formatfehler" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7535,5 +8256,5 @@ "inkompatibel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Lambert-Zonenfehler zwischenspeichern" @@ -7587,5 +8308,6 @@ "Remove the area from the relation before splitting it." msgstr "" -"Das gewählte Gebiet kann nicht geteilt werden, da es Mitglied einer Relation ist.\n" +"Das gewählte Gebiet kann nicht geteilt werden, da es Mitglied einer Relation " +"ist.\n" "Entfernen Sie das Gebiet vorm Aufteilen aus der Relation." @@ -8009,7 +8731,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "Wasser" @@ -8085,5 +8807,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 msgid "Maximum number of segments allowed in each generated way. Default 250." -msgstr "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250." +msgstr "" +"Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 @@ -8113,5 +8836,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 -msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000." +msgid "" +"Resolution of Landsat tiles, measured in pixels per degree. Default 4000." msgstr "" "Auflösung der Landsat-Kacheln, gemessen in Pixel pro Grad. Standard ist " @@ -8150,5 +8874,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81 msgid "Maximum age of each cached file in days. Default is 100" -msgstr "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100" +msgstr "" +"Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82 @@ -8408,16 +9133,21 @@ msgstr "Unbekannter Status des Fehlers" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Sichtbare öffnen..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Dateiendung unbekannt: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8509,5 +9239,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8534,25 +9264,25 @@ msgstr "Eine Liste von Routenknoten öffnen" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Routing-Ebene hinzufügen" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Kriterien" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Kürzeste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Schnellste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Route umdrehen" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Route löschen" @@ -8690,5 +9420,6 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!" -msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!" +msgstr "" +"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46 @@ -8725,11 +9456,11 @@ msgstr "Ende" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Merkmale bearbeiten" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Merkmalseditor aufrufen" @@ -8739,8 +9470,4 @@ msgstr "JOSM Mermalseditorplugin" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(nichts)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8751,5 +9478,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8758,5 +9485,5 @@ msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8778,8 +9505,14 @@ msgstr "Filter" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Löschen" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "unerwartete Spaltenzahl {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -8790,5 +9523,6 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23 -msgid "Open the tagging preset test tool for previewing tagging preset dialogs." +msgid "" +"Open the tagging preset test tool for previewing tagging preset dialogs." msgstr "" "Testwerkzeug für Objektvorlagen öffnen, um eine Vorschau auf die Dialoge der " @@ -8797,5 +9531,6 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34 msgid "You have to specify tagging preset sources in the preferences first." -msgstr "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben." +msgstr "" +"Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben." #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37 @@ -9068,5 +9803,6 @@ #, java-format msgid "The selection contains {0} way. Are you sure you want to simplify it?" -msgid_plural "The selection contains {0} ways. Are you sure you want to simplify them all?" +msgid_plural "" +"The selection contains {0} ways. Are you sure you want to simplify them all?" msgstr[0] "" "Diese Auswahl enthält {0} Weg. Sind Sie sich, dass er vereinfacht werden " @@ -9127,5 +9863,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81 msgid "Show the informational tests in the upload check windows." -msgstr "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen." +msgstr "" +"Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86 @@ -9141,5 +9878,6 @@ "An OSM data validator that checks for common errors made by users and editor " "programs." -msgstr "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft." +msgstr "" +"Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -9350,6 +10088,8 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22 -msgid "This test checks for ways that contain some of their nodes more than once." -msgstr "Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten." +msgid "" +"This test checks for ways that contain some of their nodes more than once." +msgstr "" +"Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36 @@ -9359,5 +10099,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37 -msgid "This test checks for ways with similar names that may have been misspelled." +msgid "" +"This test checks for ways with similar names that may have been misspelled." msgstr "" "Dieser Test prüft auf ähnlich benannte Wege, was auf Schreibfehler hinweisen " @@ -9692,7 +10433,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "Gebäude" @@ -9706,5 +10447,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "Fläche" @@ -9801,4 +10542,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "Startknoten an einem Wegende auswählen" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "Kreuzung erreicht" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9900,37 +10657,38 @@ "nicht identisch. Das kann zu falschen Koordinaten führen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatisches Laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 -msgid "The requested area is too big. Please zoom in a little, or change resolution" +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +msgid "" +"The requested area is too big. Please zoom in a little, or change resolution" msgstr "" "Das angeforderte Gebiet ist zu groß. Zoomen Sie ein wenig oder ändern Sie " "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Fehlerkacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alphakanal" @@ -9944,51 +10702,51 @@ msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Einstellungen für WMS-Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menüname" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Menüname (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS-URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Standard kopieren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Bitte wählen Sie eine Zeile zum Kopieren." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Kacheln überlappen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% der Breite:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% der Länge:" @@ -10045,5 +10803,6 @@ #: build/trans_plugins.java:5 msgid "A special handler for the french land registry WMS server." -msgstr "Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung." +msgstr "" +"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung." #. Plugin colorscheme @@ -10069,6 +10828,9 @@ #. Plugin czechaddress #: build/trans_plugins.java:11 -msgid "Creating and handling address nodes and buildings within Czech Republic." -msgstr "Erstellen und Bearbeiten von Adressinformationen und Gebäuden in der Tschechischen Republik." +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "" +"Erstellen und Bearbeiten von Adressinformationen und Gebäuden in der " +"Tschechischen Republik." #. Plugin DirectUpload @@ -10089,17 +10851,15 @@ #: build/trans_plugins.java:17 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 "" -"Das Hauptmerkmal dieses Plugins ist die Möglichkeit Punkte in einem GPX " -"Track zu löschen. Dieses Plugin kann dazu genutzt werden Tracks für das " -"Hochladen nach OSM vorzubereiten, z.B. um uninteressante Abschmitte eines " -"Tracks zu löschen" +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" +"Erlaubt es Nutzer Zeitstempel zu anonymisieren und Teile großer GPX-Spuren " +"schnell zu löschen." #. Plugin globalsat #: build/trans_plugins.java:19 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen." +msgstr "" +"GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen." #. Plugin grid @@ -10126,5 +10886,6 @@ #. Plugin livegps #: build/trans_plugins.java:27 -msgid "Support live GPS input (moving dot) through a connection to gpsd server." +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." msgstr "" "Echtzeitunterstützung für GPS-Daten (bewegter Punkt) mittels einer " @@ -10165,5 +10926,6 @@ #. Plugin openvisible #: build/trans_plugins.java:37 -msgid "Allows opening gpx/osm files that intersect the currently visible screen area" +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" msgstr "" "Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche den aktuellen Bereich " @@ -10172,6 +10934,8 @@ #. Plugin osmarender #: build/trans_plugins.java:39 -msgid "Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen." +msgid "" +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen." #. Plugin PicLayer @@ -10268,7 +11032,13 @@ "Schlüsselnamen ist integriert." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +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:67 -msgid "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." +#: build/trans_plugins.java:69 +msgid "" +"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" "Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, " @@ -10813,5 +11583,5 @@ #: build/trans_presets.java:199 build/trans_surveyor.java:84 msgid "Unclassified" -msgstr "Ohne Klassifikation" +msgstr "Verbindungsstraße" #. item @@ -10821,5 +11591,5 @@ #: build/trans_presets.java:203 msgid "Edit Unclassified Road" -msgstr "Straße ohne Klassifikation bearbeiten" +msgstr "Verbindungsstraße bearbeiten" #. item "Streets/Unclassified" text "Max. speed (km/h)" @@ -10931,5 +11701,5 @@ #: build/trans_presets.java:650 build/trans_presets.java:1282 msgid "paved" -msgstr "geteert" +msgstr "befestigt" #: build/trans_presets.java:232 build/trans_presets.java:250 @@ -11086,5 +11856,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "Privat" @@ -11132,5 +11902,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "Anlieger" @@ -11167,5 +11937,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "privat gestattet" @@ -11397,6 +12167,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "Autobahn" @@ -11422,6 +12192,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "Schnellstraße" @@ -11447,6 +12217,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "Bundesstraße" @@ -11472,6 +12242,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "Landesstraße" @@ -11485,5 +12255,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "Kreisstraße" @@ -11491,5 +12261,5 @@ #: build/trans_presets.java:338 msgid "unclassified" -msgstr "Ohne Klassifikation" +msgstr "Verbindungsstraße" #. color green @@ -11501,5 +12271,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "Ortsstraße" @@ -11517,5 +12287,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "Service" @@ -11542,6 +12312,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "Baustelle" @@ -11591,5 +12361,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "Kreisverkehr" @@ -12568,5 +13338,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "Marsch" @@ -14290,27 +15060,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "Sport" @@ -17148,8 +17918,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "Fahrrad" @@ -17210,6 +17980,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17220,8 +17988,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "Fuß" @@ -17247,5 +18015,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "U-Bahn" @@ -17330,4 +18098,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17342,8 +18111,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17363,5 +18134,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "Standard" @@ -17451,7 +18222,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "Brücke" @@ -17715,15 +18486,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "veraltet" @@ -17765,5 +18536,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "Pferd" @@ -17973,11 +18744,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "Barriere" @@ -18015,6 +18786,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "Straße" @@ -18070,7 +18841,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "Weg" @@ -18126,8 +18897,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "Eisenbahn" @@ -18148,5 +18919,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "Service" @@ -18160,5 +18931,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "Furt" @@ -18179,5 +18950,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "Wendekreis" @@ -18192,5 +18963,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "Notfallrettungspunkt" @@ -18205,5 +18976,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "Flussufer" @@ -18217,5 +18988,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "Fluss" @@ -18229,5 +19000,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "Dock" @@ -18255,5 +19026,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "Aquädukt" @@ -18421,13 +19192,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "Zivilisationsbauten" @@ -18489,7 +19260,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "Eisenbahnpunkt" @@ -18512,10 +19283,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "Andere Bahnen" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "Eisenbahn-Überlagerung" @@ -18545,6 +19316,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "Alte Eisenbahn" @@ -18589,6 +19360,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "Rollweg" @@ -18602,5 +19373,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "Terminal" @@ -18622,5 +19393,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "Rollweg (dunkel)" @@ -18634,5 +19405,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "Rollweg (hell)" @@ -18680,7 +19451,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "Luftweg" @@ -18697,5 +19468,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "Einfache Piste" @@ -18710,5 +19481,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "Mittelschwere Piste" @@ -18723,5 +19494,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "Fortgeschrittenenpiste" @@ -18736,5 +19507,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "Expertenpiste" @@ -18749,5 +19520,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "freie Piste" @@ -18762,5 +19533,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "Anfängerpiste" @@ -18865,10 +19636,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "Strom" @@ -18881,8 +19652,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "Anlegestelle (Pier)" @@ -18896,5 +19665,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "Pipeline" @@ -19022,12 +19791,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "Freizeit" @@ -19041,5 +19810,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "Jachthafen" @@ -19111,8 +19880,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "Einrichtungen" @@ -19214,10 +19983,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "Verkehrseinrichtungen" @@ -19603,22 +20372,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "Einrichtungen (hell)" @@ -19650,6 +20419,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "Wasser (hell)" @@ -19710,8 +20479,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "Gesundheit" @@ -20064,26 +20833,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "Geschäft" @@ -20155,8 +20924,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "Hotel" @@ -20306,9 +21075,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "Tourismus" @@ -20380,8 +21149,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "Historisch" @@ -20452,8 +21221,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "Grün" @@ -20467,5 +21236,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "Steinbruch" @@ -20479,5 +21248,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "Mülldeponie" @@ -20499,5 +21268,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "Wasserbecken" @@ -20511,5 +21280,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "Forst" @@ -20523,5 +21292,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "Farmland" @@ -20544,5 +21313,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "Einkaufsbereich" @@ -20556,5 +21325,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "Industriegebiet" @@ -20568,5 +21337,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "Baulücke" @@ -20580,5 +21349,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "Bauland" @@ -20592,5 +21361,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "Eisenbahnland" @@ -20647,7 +21416,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "Militär" @@ -20661,5 +21430,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "Friedhof" @@ -20672,5 +21441,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "Berggipfel" @@ -20685,5 +21454,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "Gletscher" @@ -20697,5 +21466,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "Vulkan" @@ -20750,8 +21519,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "Natur" @@ -20765,5 +21534,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "Buschland" @@ -20777,5 +21546,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "Heide" @@ -20789,5 +21558,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "Naturwald" @@ -20801,5 +21570,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "Schlick & Moor" @@ -20813,5 +21582,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "Strand" @@ -20889,8 +21658,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "Route" @@ -20938,7 +21707,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "Grenze" @@ -21080,10 +21849,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "Ort" @@ -21131,6 +21900,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "Adresse" @@ -21361,10 +22130,10 @@ msgstr "LandSat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "OpenAerial-Karte" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21412,2 +22181,12 @@ msgstr "Straßen NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +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 "Terraserver Urban" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 15801) +++ /applications/editors/josm/i18n/po/el.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:00+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-06 17:26+0000\n" "Last-Translator: alichani \n" "Language-Team: Greek \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "" -"Αδυναμία ανάγνωσης προβολής από τις προτιμήσεις. Θα χρησιμοποιηθεί EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "Η προβολή δεν μπόρεσε να διαβαστεί από τις προτιμήσεις. Χρήση Mercator" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Μη αποθηκευμένες αλλαγές" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Αποθήκευση και Έξοδος" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Απόρριψη και Έξοδος" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +102,10 @@ msgstr "Ακύρωση" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Πρόσθετα" @@ -254,15 +254,15 @@ msgstr "Γεωγραφικό μήκος" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Τακτοποίηση Κόμβων σε Κύκλο" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Μετακίνηση των επιλεγμένων κόμβων σε κύκλο" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +294,9 @@ msgstr "Εργαλείο: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους." @@ -330,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "σύγκρουση" @@ -468,5 +469,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -477,7 +478,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Διαγραφή" @@ -487,14 +488,15 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Αντικατάσταση" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Το αρχείο υπάρχει. Αντικατάσταση;" @@ -523,9 +525,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -563,16 +565,4 @@ msgstr "Έξοδος από την εφαρμογή" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Αρχεία Διακομιστή OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Αρχεία GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Αρχεία NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -646,12 +636,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -659,5 +649,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Σφάλμα" @@ -678,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -793,4 +783,18 @@ msgstr "Συγχώνευση {0} κόμβων" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -847,67 +851,25 @@ msgstr "χωρίς όνομα" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Άνοιγμα..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Άνοιγμα αρχείου." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Σφάλμα κατά την ερμηνεία {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Άγνωστη επέκταση αρχείου: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Σημάδια από {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Εισήχθησαν συντεταγμένες: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Κακοσχηματισμένες προτάσεις: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Σφάλματα στο άθροισμα ελέγχου: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Άγνωστες προτάσεις: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Μηδενικές συντεταγμένες: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Επιτυχία εισαγωγής NMEA" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Αποτυχία εισαγωγής NMEA!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -982,5 +944,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Επικόλληση" @@ -1009,5 +971,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Προτιμήσεις" @@ -1053,14 +1015,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Αποθήκευση" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Αποθήκευση τεχόντων δεδομένων." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1070,26 +1037,26 @@ "αναφέρετε το σαν σφάλμα." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Κενό έγγραφο" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Το έγγραφο δεν περιέχει δεδομένα." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Επιβεβαίωση αποθήκευσης" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Συγκρούσεις" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1097,32 +1064,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Απόρριψη διενέξεων και Αποθήκευση" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Αποθήκευση αρχείου OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Αποθήκευση αρχείου GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Αποθήκευση αρχείου OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Άγνωστη επέκταση αρχείου." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας." @@ -1156,4 +1127,6 @@ msgid "Show status report with useful information that can be attached to bugs" msgstr "" +"Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να " +"επισυναφθούν σε σφάλματα" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 @@ -1251,52 +1224,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Επιλέξτε οποιοδήποτε:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Ένας κόμβος με ετικέτα, ή" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One node that is used by more than one way, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1304,5 +1277,5 @@ "χρησιμοποιούνται από περισσότερο από έναν δρόμο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1312,18 +1285,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Ξεκολημένος Κόμβος" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" -msgstr "" +msgstr "Αντιγραφή σε {0} κόμβους" #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" -msgstr "" +msgstr "Αντιγραφή {0} κόμβων σε {1} κόμβους" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 @@ -1372,4 +1345,6 @@ "No data to update found. Have you already opened or downloaded a data layer?" msgstr "" +"Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα επίπεδο " +"δεδομένων;" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77 @@ -1382,50 +1357,50 @@ "συνεχίσετε;" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Αποστολή προς OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Αντικείμενα που θα προστεθούν:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Αντικείμενα που θα αλλαχτούν" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Αντικείμενα που θα διαγραφούν:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Να αποσταλούν αυτές οι αλλαγές;" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Αποστολή Αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1629,14 +1604,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Δημιοθργία νέου κόμβου." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Επιλογή κόμβου στο σημείο του κέρσορα." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1645,14 +1620,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Τέλος σχεδιασμού." @@ -1672,5 +1647,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1685,5 +1660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή" @@ -1718,5 +1693,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1725,5 +1700,5 @@ "συγχώνευση με το πλησιέστερο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1748,16 +1723,16 @@ "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1765,147 +1740,157 @@ msgstr "Δε φορτώθηκαν δεδομένα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "αντικατάσταση επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "προσθήκη στην επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "αφαίρεση από την επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1919,15 +1904,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." msgstr "Αναμενόταν κλείσιμο παρένθεσης." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1962,7 +1977,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Προσθήκη" @@ -2002,4 +2017,8 @@ msgstr "Ρύθμιση {0}={1} για {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2007,65 +2026,10 @@ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Διαγραφή {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Διαγραφή {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Αντικρουόμενη σχέση" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Διαγραφή από σχέση" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Μετακίνηση" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2077,169 +2041,19 @@ msgstr[1] "κόμβοι" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "ΒγάλεΜέλοςΣχέσης" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Περιστροφή" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Ακολουθία" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Εφαρμογή;" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Εφαρμογή επιλεγμένων αλλαγών" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Να μην εφαρμοστούν οι αλλαγές" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Ιδιότητες του " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Ρόλοι σε σχέσεις που αναφέροντε στο" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Αυτόματη διόρθωση ετικέτας" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "διαφορετικά" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "διαγράφηκε" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "αληθές" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "ψευδές" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "θέση" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Δεκαδικές Μοίρες" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "Ν" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "Β" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "Δ" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "Α" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "μη ολοκληρωμένη" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Σφάλμα: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Προειδοποίηση: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2251,4 +2065,264 @@ msgstr[1] "σχέσεις" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Διαγραφή {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Διαγραφή {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Αντικρουόμενη σχέση" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Διαγραφή από σχέση" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Μετακίνηση" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "ΒγάλεΜέλοςΣχέσης" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Περιστροφή" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Ακολουθία" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Εφαρμογή;" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "διαφορετικά" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "διαγράφηκε" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "αληθές" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "ψευδές" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "θέση" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Δεκαδικές Μοίρες" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "Ν" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "Β" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "Δ" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "Α" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "μη ολοκληρωμένη" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Σφάλμα: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Προειδοποίηση: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2283,138 +2357,129 @@ msgstr[1] "{0} κόμβοι" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Άδειο μέλος στη σχέση." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Άγνωστος ρόλος \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Άγνωστος τύπος μέλους για το \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Οδός \"από\" δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "Χωρίς ετικέτα" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "κείμενο" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "" -msgstr[1] "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2436,5 +2501,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2515,4 +2580,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2527,4 +2593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2733,26 +2800,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Αρχείο" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2761,21 +2828,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Ήχος" @@ -2885,4 +2952,493 @@ msgstr "Αρχικοποίηση" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Ετικέτες" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Μέλη" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Αφαίρεση" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Ρόλος" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2896,5 +3452,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2925,9 +3481,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2935,25 +3491,69 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Διένεξη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Συγχώνευση διενέξεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Επίλυση Διενέξεων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Επίλυση Διένεξης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Διενέξεις: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Προειδοποίηση" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3117,10 +3717,4 @@ msgid "Member Of" msgstr "Μέλος του" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Ρόλος" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3307,8 +3901,4 @@ msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Μέλη" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3342,11 +3932,4 @@ msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Αφαίρεση" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3401,5 +3984,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3424,5 +4007,5 @@ msgstr "ναι" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3449,24 +4032,24 @@ msgstr "όχι" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Μέλη: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Επεξεργαστής Σχέσεων: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Αδυναμία σύνδεσης με το διακομιστή" @@ -3724,10 +4307,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Προειδοποίηση" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3766,5 +4343,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3802,53 +4379,53 @@ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "σημείο gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Προσαρμογή του σχεδιασμού γραμμών" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Χρηση καθολικών ρυθμίσεων." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Προσαρμογή Χρώματος" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "Εντάξει" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3856,6 +4433,6 @@ msgstr "Προκαθορισμένο" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3863,31 +4440,31 @@ msgstr "Επιλέξτε ένα χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Σημάδια από Ονομασμένα Σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Εισαγωγή Ήχου" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Αρχεία Κυματομορφής (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Σημάδια ήχου από {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Εισαγωγή εικόνων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3896,5 +4473,5 @@ msgstr[1] "{0} τροχιές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3903,5 +4480,5 @@ msgstr[1] "{0} διαδρομές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3910,28 +4487,28 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Όνομα: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Περιγραφή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Διάρκεια: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Μήκος: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Μετατροπή σε επίπεδο δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3942,11 +4519,11 @@ "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3956,29 +4533,29 @@ msgstr "Μετατράπηκε από: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} μέτρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} τετρ. χλμ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3989,10 +4566,10 @@ "συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4000,5 +4577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4015,24 +4592,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} διαγράφηκαν.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4068,5 +4645,5 @@ msgstr[1] "σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4075,5 +4652,5 @@ msgstr[1] "ένα ίχνος με {0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4082,5 +4659,5 @@ msgstr[1] "το {0} αποτελείται από {1} ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4218,5 +4795,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." @@ -5556,5 +6133,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Ενημέρωση" @@ -5566,7 +6143,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5574,4 +6150,8 @@ msgid "Please select an entry." msgstr "Παρακαλώ επιλέξτε μια επιλογή" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5934,5 +6514,5 @@ msgstr "Άγνωστος τύπος: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5943,15 +6523,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5961,18 +6541,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -6010,7 +6590,52 @@ msgstr "Προετοιμασία δεδομένων..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Αρχεία GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Σημάδια από {0}" + #: ../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/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Αρχεία NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Εισήχθησαν συντεταγμένες: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Κακοσχηματισμένες προτάσεις: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Σφάλματα στο άθροισμα ελέγχου: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Άγνωστες προτάσεις: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Μηδενικές συντεταγμένες: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Επιτυχία εισαγωγής NMEA" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Αποτυχία εισαγωγής NMEA!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6068,4 +6693,13 @@ msgid "Unknown host" msgstr "Άγνωστος υπολογιστής" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6094,7 +6728,15 @@ msgstr "Διακοπή..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "Αρχεία Διακομιστή OSM" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 @@ -6139,7 +6781,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6185,5 +6827,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6207,15 +6849,20 @@ "ξαναδοκιμάστε αργότερα." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Ενημέρωση πρόσθετων" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Λήψη Πρόσθετων" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6228,22 +6875,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" msgstr[1] "" -"{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6261,25 +6918,25 @@ "χρειάζεται πλέον." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Δεν βρέθηκε το πρόσθετο: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6290,12 +6947,12 @@ "διαμόρφωση.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Απενεργοποίηση πρόσθετου" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -6303,9 +6960,9 @@ "Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6315,5 +6972,5 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6323,10 +6980,10 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6335,9 +6992,9 @@ "κάντε αναφορά για bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Να απενεργοποιηθεί το πρόσθετο;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6347,5 +7004,5 @@ "να αποφορτωθεί το πρόσθετο." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6355,19 +7012,19 @@ "πήρατε το JOSM για το πρόβλημα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Πληροφορίες" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "δεν υπάρχει περιγραφή" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6376,13 +7033,13 @@ msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6395,9 +7052,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Λήψη πρόσθετων που λείπουν" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6410,10 +7067,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Λήψη Πρόσθετων" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6436,41 +7089,14 @@ msgstr "άγνωστο" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Έκδοση {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Πρόσθετα που έρχονται με το JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Το πρόσθετο υπάρχει ήδη" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την τρέχουσα " -"έκδοση διαγράφοντας το υπάρχον αρχείο;\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Διαγραφή και Λήψη" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6623,9 +7249,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Ετικέτες" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6797,4 +7418,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Σφάλμα κατά την ερμηνεία {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7018,6 +7644,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" @@ -7341,37 +7967,42 @@ "Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Άδειο επίπεδο" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Δεν είναι διανυσματικό." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Είναι διανυσματικό." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7380,16 +8011,21 @@ msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7398,14 +8034,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7446,7 +8082,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Υδατόρρευμα" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7877,7 +8512,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "νερό" @@ -8267,16 +8902,21 @@ msgstr "Άγνωστη κατάσταση θέματος" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Άγνωστη επέκταση αρχείου: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8365,5 +9005,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8390,25 +9030,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8581,11 +9221,11 @@ msgstr "τέλος" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8595,8 +9235,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8607,5 +9243,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8614,5 +9250,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8634,7 +9270,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9526,7 +10168,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "κτίριο" @@ -9540,5 +10182,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9629,4 +10271,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9702,19 +10360,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Αυτόματη λήψη" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9722,17 +10380,17 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Ανανέωση λανθασμένων πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Κανάλι άλφα" @@ -9746,9 +10404,9 @@ msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Προτιμήσεις πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" @@ -9756,43 +10414,43 @@ "πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Όνομα μενού" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Όνομα Μενού (Προκαθορισμένο)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (Προκαθορισμένο)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Αντιγραφή Προξαθορισμένου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9880,7 +10538,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10030,6 +10687,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10847,5 +11509,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "ιδιωτικό" @@ -10893,5 +11555,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "προορισμός" @@ -10928,5 +11590,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11158,6 +11820,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "Αυτοκινητόδρομος" @@ -11183,6 +11845,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11208,6 +11870,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "πρωτεύων" @@ -11233,6 +11895,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "δευτερεύων" @@ -11246,5 +11908,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11262,5 +11924,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "Οικιστική" @@ -11278,5 +11940,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11303,6 +11965,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11352,5 +12014,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "κυκλικός κόμβος" @@ -12329,5 +12991,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "έλος" @@ -14051,27 +14713,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "άθληση" @@ -16909,8 +17571,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "ποδήλατο" @@ -16971,6 +17633,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16981,8 +17641,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -17008,5 +17668,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "υπόγειος" @@ -17091,4 +17751,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17103,8 +17764,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17124,5 +17787,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17212,7 +17875,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "γέφυρα" @@ -17476,15 +18139,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17526,5 +18189,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "άλογο" @@ -17734,11 +18397,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17776,6 +18439,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "οδός" @@ -17831,7 +18494,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17887,8 +18550,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17909,5 +18572,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17921,5 +18584,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17940,5 +18603,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17953,5 +18616,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17966,5 +18629,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "όχθη ποταμού" @@ -17978,5 +18641,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "υδατόρρευμα" @@ -17990,5 +18653,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "προβλήτα" @@ -18016,5 +18679,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "υδαταγωγός" @@ -18182,13 +18845,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18250,7 +18913,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18273,10 +18936,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18306,6 +18969,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18350,6 +19013,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18363,5 +19026,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18383,5 +19046,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18395,5 +19058,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18441,7 +19104,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18458,5 +19121,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "πίστα εύκολη" @@ -18471,5 +19134,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "πίστα μεσαία" @@ -18484,5 +19147,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "πίστα προχορημένη" @@ -18497,5 +19160,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18510,5 +19173,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18523,5 +19186,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "πιστα αρχαρίων" @@ -18626,10 +19289,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18642,8 +19305,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "προβλήτα" @@ -18657,5 +19318,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "αγωγός" @@ -18783,12 +19444,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "αναψυχή" @@ -18802,5 +19463,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18872,8 +19533,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18975,10 +19636,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19364,22 +20025,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19411,6 +20072,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19471,8 +20132,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "υγεία" @@ -19825,26 +20486,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "κατάστημα" @@ -19916,8 +20577,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "ξενοδοχείο" @@ -20067,9 +20728,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "τουρισμός" @@ -20141,8 +20802,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "ιστορικό" @@ -20213,8 +20874,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20228,5 +20889,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "λατομείο" @@ -20240,5 +20901,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "Χ.Υ.Τ.Α." @@ -20260,5 +20921,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "λεκάνη" @@ -20272,5 +20933,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "δάσος" @@ -20284,5 +20945,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20305,5 +20966,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20317,5 +20978,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "βιομηχανική" @@ -20329,5 +20990,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20341,5 +21002,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20353,5 +21014,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20408,7 +21069,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "στρατιωτική" @@ -20422,5 +21083,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "κοιμητήριο" @@ -20433,5 +21094,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "κορυφή" @@ -20446,5 +21107,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "παγετώνας" @@ -20458,5 +21119,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "ηφαίστειο" @@ -20511,8 +21172,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20526,5 +21187,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20538,5 +21199,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20550,5 +21211,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "άλσος" @@ -20562,5 +21223,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "λάσπη" @@ -20574,5 +21235,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "παραλία" @@ -20650,8 +21311,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20699,7 +21360,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "όριο" @@ -20841,10 +21502,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20892,6 +21553,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "διεύθυνση" @@ -21122,10 +21783,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Άνοιγμα Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21173,6 +21834,30 @@ msgstr "Streets NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." + #~ 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 "Navigation" @@ -21189,4 +21874,32 @@ #~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):" +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." + +#~ msgid "Plugin already exists" +#~ msgstr "Το πρόσθετο υπάρχει ήδη" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" + #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα." + +#~ 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 "Delete and Download" +#~ msgstr "Διαγραφή και Λήψη" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 15801) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 15802) @@ -10,6 +10,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-22 12:47+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-09 15:39+0000\n" "Last-Translator: nin2jardin \n" "Language-Team: British English \n" @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:12+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -27,68 +27,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "The projection could not be read from preferences. Using EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "The projection could not be read from preferences. Using Mercartor" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Unsaved Changes" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Save and Exit" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Discard and Exit" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -96,5 +97,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -103,10 +104,10 @@ msgstr "Cancel" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -190,5 +191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Plugins" @@ -255,15 +256,15 @@ msgstr "Longitude" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Align Nodes in Circle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Move the selected nodes into a circle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -272,8 +273,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -294,9 +296,9 @@ msgstr "Tool: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Some of the nodes are (almost) in the line" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Please select at least four nodes." @@ -331,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflict" @@ -475,5 +477,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -484,7 +486,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Delete" @@ -494,14 +496,15 @@ msgstr "Delete selected objects." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Overwrite" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "File exists. Overwrite?" @@ -529,9 +532,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -569,16 +572,4 @@ msgstr "Exit the application." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM Server Files" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX Files" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 Files" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -652,12 +643,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -665,5 +656,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Error" @@ -684,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -799,4 +790,18 @@ msgstr "Merge {0} nodes" +#: ../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:70 +msgid "Mirror" +msgstr "Mirror" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "Mirror selected nodes and ways." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Please select at least one node or way." + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -853,67 +858,25 @@ msgstr "unnamed" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Open..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Open a file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Error while parsing {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Unknown file extension: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markers from {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Coordinates imported: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Malformed sentences: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Checksum errors: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Unknown sentences: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Zero coordinates: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA import success" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA import faliure!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -987,5 +950,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Paste" @@ -1014,5 +977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Preferences" @@ -1058,14 +1021,19 @@ msgstr "Reverse ways" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Save" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Save the current data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "File {0} exists. Overwrite?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1075,26 +1043,26 @@ "a bug." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "No document open so nothing to save." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Empty document" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "The document contains no data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Save anyway" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1104,32 +1072,36 @@ "if you rejected all. Continue?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Reject Conflicts and Save" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Save OSM file" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Save GPX file" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Save OSM file" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Save Layer" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Could not back up file." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Unknown file extension." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "An error occurred while saving." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "An error occurred while restoring backup file." @@ -1269,46 +1241,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:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicate nodes that are used by multiple ways." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Select either:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* One tagged node, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1316,5 +1288,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:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1322,5 +1294,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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1334,9 +1306,9 @@ "own copy and all nodes will be selected." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Unglued Node" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1344,5 +1316,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1403,50 +1375,50 @@ "continue?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Upload to OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Upload all changes to the OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objects to add:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objects to modify:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objects to delete:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Upload these changes?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Upload Changes" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "No changes to upload." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1652,14 +1624,14 @@ msgstr "Add node into way and connect" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Create new node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Select node under cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1668,14 +1640,14 @@ msgstr[1] "Insert new node into {0} ways." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Start new way from last node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Continue way from last node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Finish drawing." @@ -1695,5 +1667,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Release the mouse button to select the objects in the rectangle." @@ -1704,5 +1676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Release the mouse button to stop rotating." @@ -1739,5 +1711,5 @@ msgstr[1] "Add and move a virtual new node to {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1745,5 +1717,5 @@ "Release the mouse button to stop moving. Ctrl to merge with nearest node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1770,16 +1742,16 @@ "move zoom with right button" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1787,53 +1759,65 @@ msgstr "No data loaded." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1841,92 +1825,94 @@ "type: - type of the object (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +"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 "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +"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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1943,15 +1929,47 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Unexpected token: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Missing arguments for or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Missing argument for not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +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:595 +#, 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:602 +#, 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:33 @@ -1986,7 +2004,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Add" @@ -2026,4 +2044,8 @@ msgstr "Set {0}={1} for {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ChangeRelationMemberRole" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2031,4 +2053,54 @@ msgstr "Resolve {0} conflicts in {1} objects" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 +#: ../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:216 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "node" +msgid_plural "nodes" +msgstr[0] "node" +msgstr[1] "nodes" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "way" +msgstr[1] "ways" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 +#: ../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:483 +msgid "relation" +msgid_plural "relations" +msgstr[0] "relation" +msgstr[1] "relations" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, 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:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "cannot resolve undecided conflict" + #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 #, java-format @@ -2041,10 +2113,10 @@ msgstr "Delete {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 msgid "Conflicting relation" msgstr "Conflicting relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 #, java-format msgid "" @@ -2055,11 +2127,11 @@ "Delete from relation?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 msgid "Delete from relation" msgstr "Delete from relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 #, java-format msgid "" @@ -2070,10 +2142,10 @@ "Delete from relation?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 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:347 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2085,19 +2157,17 @@ "be using them.
Do you really want to delete?" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53 +#, 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:118 msgid "Move" msgstr "Move" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 -#: ../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:216 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "node" -msgid_plural "nodes" -msgstr[0] "node" -msgstr[1] "nodes" +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "Resolve conflicts in member list of relation {0}" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 @@ -2105,5 +2175,5 @@ msgstr "RemoveRelationMember" -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 msgid "Rotate" msgstr "Rotate" @@ -2112,4 +2182,19 @@ msgid "Sequence" msgstr "Sequence" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Resolve {0} tag conflicts in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "Resolve version conflicts for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Resolve conflicts in node list of of way {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -2153,39 +2238,39 @@ msgstr "New value" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:39 +#: ../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:40 +#: ../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:82 +#: ../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:95 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 msgid "Properties of " msgstr "Properties of " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 +#: ../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:135 +#: ../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:310 +#: ../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:320 +#: ../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:338 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 #, java-format msgid "Preferences file had errors. Making backup of old one to {0}." @@ -2211,4 +2296,5 @@ #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 msgid "deleted" msgstr "deleted" @@ -2250,5 +2336,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 @@ -2266,13 +2352,4 @@ msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 -#: ../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:483 -msgid "relation" -msgid_plural "relations" -msgstr[0] "relation" -msgstr[1] "relations" - #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2307,138 +2384,129 @@ msgstr[1] "{0} nodes" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Area style way is not closed." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon way ''{0}'' is not closed." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Empty member in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Deleted member ''{0}'' in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Way ''{0}'' with less than two points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "More than one \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "More than one \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "More than one \"via\" found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Unknown role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unknown member type for ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "No \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "No \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "No \"via\" node or way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "The \"from\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "The \"to\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "The \"from\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "The \"to\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Style for restriction {0} not found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "No useful role ''{0}'' for Way ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-Way ''{0}'' in multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "No outer way for multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection between ways ''{0}'' and ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner way ''{0}'' is outside." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Style for inner way ''{0}'' equals multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Style for outer way ''{0}'' mismatches." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "untagged" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "way" -msgstr[1] "ways" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2460,5 +2528,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2546,4 +2614,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2558,4 +2627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2766,26 +2836,26 @@ msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2794,21 +2864,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Wireframe View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Toggle Wireframe view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Full Screen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Toggle Full Screen view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2919,4 +2989,513 @@ msgstr "Initialising" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "My with Their" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "My with Merged" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "Their with Merged" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "role {0} is not participating in compare pair {1}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "Properties" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Tags" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "Nodes" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Members" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +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:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "Tags({0} conflicts)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, 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:104 +msgid "Nodes(resolved)" +msgstr "Nodes(resolved)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgid "" +"Merged node list frozen. No pending conflicts in the node list of this way" +msgstr "" +"Merged node list frozen. No pending conflicts in the node list of this way" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +msgid "Nodes(with conflicts)" +msgstr "Nodes(with conflicts)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +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:113 +msgid "Members(resolved)" +msgstr "Members(resolved)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +msgid "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" +msgstr "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +msgid "Members(with conflicts)" +msgstr "Members(with conflicts)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +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:125 +msgid "No pending property conflicts" +msgstr "No pending property conflicts" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "Properties(with conflicts)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "Pending property conflicts to be resolved" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "Conflict Resolution" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "parameter current out of range: got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "list in role {0} is currently not participating in a compare pair" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "unexpected value of parameter \"index\". Got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "item {0} not found in list" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "lock scrolling" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "Compare " + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "My version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "List of elements in my dataset, i.e. the local dataset" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "Merged version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "Their version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "List of elements in their dataset, i.e. the server dataset" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "> top" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "Copy my selected nodes to the start of the merged node list" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "> bottom" + +#: ../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 "Copy my selected elements to the end of the list of merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" + +#: ../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 "" +"Copy their selected element to the start of the list of merged elements" + +#: ../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 "Copy their selected elements to the end of the list of merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" +"Copy their selected element after the first selected element in the list of " +"merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "Up" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "Move up the selected elements by one position" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "Down" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "Move down the selected entries by one position" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Remove" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "Remove the selected entries from the list of merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "Freeze" + +#: ../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 "Freeze the current list of merged elements" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +msgstr "Unfreeze" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 +msgid "Unfreeze the list of merged elements and start merging" +msgstr "Unfreeze the list of merged elements and start merging" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" +"Click {0} to start merging my and their entries" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" +"html>Click {0} to finish merging my and their entries" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "My version ({0} entry)" +msgstr[1] "My version ({0} entries)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "Merged version ({0} entry)" +msgstr[1] "Merged version ({0} entries)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "Their version ({0} entry)" +msgstr[1] "Their version ({0} entries)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "parameter '{0}' must not be null" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "adjustable {0} not registered yet" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "Node" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "Merged nodes not frozen yet. Can't build resolution command" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "unexpected column index. Got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +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:83 +msgid "" +"Properties in the merged element. They will replace properties in my " +"elements when merge decisions are applied." +msgstr "" +"Properties in the merged element. They will replace properties in my " +"elements when merge decisions are applied." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +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:102 +msgid "Coordinates:" +msgstr "Coordinates:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "Deleted State:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "not deleted" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "Keep my coordiates" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "Keep their coordiates" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "Undecide conflict between different coordinates" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "Keep my deleted state" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "Keep their deleted state" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted state" +msgstr "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Role" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "Primitive" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "merged nodes not frozen yet. Can't build resolution command" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "The merged dataset will not include a tag with key {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "My dataset does not include a tag with key {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2930,5 +3509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2960,33 +3539,77 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Merging conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Resolve Conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Solve Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflicts: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Warning" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3148,10 +3771,4 @@ msgid "Member Of" msgstr "Member Of" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Role" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3336,8 +3953,4 @@ msgstr "Tags (empty value deletes tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Members" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3371,11 +3984,4 @@ msgid "Move the currently selected members down" msgstr "Move the currently selected members down" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Remove" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3430,5 +4036,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3453,5 +4059,5 @@ msgstr "yes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3478,24 +4084,24 @@ msgstr "no" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Members: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relation Editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "There were conflicts during import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Error parsing server response." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Cannot connect to server." @@ -3750,10 +4356,4 @@ msgstr "Image with path {0} does not exist or is not readable." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Warning" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3792,5 +4392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3828,53 +4428,53 @@ msgstr "Time entered could not be parsed." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps point" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Customise line drawing" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Use global settings." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Do not draw lines between points for this layer." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Select line drawing options" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Customise Colour" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3882,6 +4482,6 @@ msgstr "Default" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3889,31 +4489,31 @@ msgstr "Choose a colour" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Markers From Named Points" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Named Trackpoints from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Import Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave Audio files (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Audio markers from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Import images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3922,5 +4522,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3929,5 +4529,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3936,28 +4536,28 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Length: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Convert to data layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3968,11 +4568,11 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3982,29 +4582,29 @@ msgstr "Converted from: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Download everything within:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maximum area per request:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4015,9 +4615,9 @@ "wish
to continue?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4027,5 +4627,5 @@ "the end were omitted or moved to the start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4044,24 +4644,24 @@ msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} deleted.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4097,5 +4697,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4104,5 +4704,5 @@ msgstr[1] "a track with {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4111,5 +4711,5 @@ msgstr[1] "{0} consists of {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4249,5 +4849,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Please select the row to delete." @@ -5606,5 +6206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Update" @@ -5616,7 +6216,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5624,4 +6223,8 @@ msgid "Please select an entry." msgstr "Please select an entry." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6011,5 +6614,5 @@ msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6020,15 +6623,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6038,18 +6641,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Change Properties" @@ -6087,7 +6690,52 @@ msgstr "Preparing data..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX Files" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markers from {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Parse error: invalid document structure for gpx document" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 Files" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Coordinates imported: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Malformed sentences: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Checksum errors: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Unknown sentences: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Zero coordinates: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA import success" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA import faliure!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6148,4 +6796,13 @@ msgstr "Unknown host" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6173,8 +6830,16 @@ msgstr "Aborting..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM Server Files" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6205,20 +6870,20 @@ #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" +msgstr "Missing attribute \"ref\" on member in relation {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -msgstr "" +msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" +msgstr "Missing attribute \"type\" on member {0} in relation {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Deleted member ''{0}'' in relation." +msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6235,9 +6900,10 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" +"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Missing attribute \"version\" on OSM primitive with id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 @@ -6264,5 +6930,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6270,4 +6936,6 @@ "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/io/OsmServerReader.java:85 @@ -6285,15 +6953,20 @@ "some time." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Update Plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Download Plugins" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6306,22 +6979,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." -msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Could not download plugin: {0} from {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." +msgid "Skip download" msgstr "" -"The plugin {0} seems to be broken or could not be downloaded automatically." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6339,25 +7022,25 @@ "required." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Plugin requires JOSM update: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin not found: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6367,21 +7050,21 @@ "setting the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Disable plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Keep plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6391,5 +7074,5 @@ "overwrite the existing ones." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6398,10 +7081,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6409,9 +7092,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Should the plugin be disabled?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6421,5 +7104,5 @@ "unload the plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6429,19 +7112,19 @@ "about the problem." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "no description available" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "More details" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6450,13 +7133,13 @@ msgstr[1] "Downloaded plugin information from {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "No plugin information found." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "All installed plugins are up to date." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6469,9 +7152,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Download missing plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6484,10 +7167,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Download Plugins" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6510,41 +7189,14 @@ msgstr "unknown" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin bundled with JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Plugin already exists" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Delete and Download" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Error deleting plugin file: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6696,9 +7348,4 @@ msgstr "Please enter Description about your trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Tags" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6870,4 +7517,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Error while parsing {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7102,6 +7754,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Error loading file" @@ -7438,37 +8090,42 @@ "Select one of them first, then retry" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Blank Layer" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS layer ({0}), {1} tile(s) loaded" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Is not vectorised." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Raster centre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Is vectorised." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Commune bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7477,16 +8134,21 @@ msgstr "Load WMS layer from file" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7497,14 +8159,14 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Cache Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, 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:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Cache Lambert Zone Error" @@ -7545,11 +8207,10 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Split Way" +msgstr "Split area" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Splits an area by an untagged way." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -7559,4 +8220,7 @@ "Remove the area from the relation before splitting it." msgstr "" +"The selected area cannot be splitted, because it is a member of some " +"relation.\n" +"Remove the area from the relation before splitting it." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -7979,7 +8643,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "water" @@ -8368,16 +9032,21 @@ msgstr "Unknown issue state" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Open Visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Unknown file extension: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8469,5 +9138,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8494,25 +9163,25 @@ msgstr "Open a list of routing nodes" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Add routing layer" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Criteria" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Shortest" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Fastest" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Reverse route" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Clear route" @@ -8685,11 +9354,11 @@ msgstr "end" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Edit tags" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Launches the tag editor dialogue" @@ -8699,8 +9368,4 @@ msgstr "JOSM Tag Editor Plugin" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(none)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8711,5 +9376,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8718,5 +9383,5 @@ msgstr[1] "Remove old keys from up to {0} objects" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8738,8 +9403,14 @@ msgstr "Filter" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Clear" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9648,7 +10319,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "building" @@ -9662,5 +10333,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "area" @@ -9751,4 +10422,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9846,19 +10533,19 @@ "This may lead to wrong coordinates." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatic downloading" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9866,17 +10553,17 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alpha channel" @@ -9890,51 +10577,51 @@ msgstr "Open a blank WMS layer to load data from a file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "WMS Plugin Preferences" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menu Name" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Menu Name (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Enter a menu name and WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Copy Default" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Please select the row to copy." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Overlap tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% of lat:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% of lon:" @@ -10015,4 +10702,5 @@ "Creating and handling address nodes and buildings within Czech Republic." msgstr "" +"Creating and handling address nodes and buildings within Czech Republic." #. Plugin DirectUpload @@ -10033,11 +10721,7 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" -"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." #. Plugin globalsat @@ -10211,6 +10895,11 @@ "for the common ones. Spellcheck integrated for tag names." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11029,5 +11718,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "private" @@ -11075,5 +11764,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "destination" @@ -11110,5 +11799,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permissive" @@ -11340,6 +12029,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "motorway" @@ -11365,6 +12054,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "trunk" @@ -11390,6 +12079,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "primary" @@ -11415,6 +12104,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "secondary" @@ -11428,5 +12117,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "tertiary" @@ -11444,5 +12133,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "residential" @@ -11460,5 +12149,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "service" @@ -11485,6 +12174,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "construction" @@ -11534,5 +12223,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "roundabout" @@ -12511,5 +13200,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "marsh" @@ -14233,27 +14922,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -17091,8 +17780,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bicycle" @@ -17153,6 +17842,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17163,8 +17850,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "foot" @@ -17190,5 +17877,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "subway" @@ -17273,4 +17960,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17285,8 +17973,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17306,5 +17996,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17394,7 +18084,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "bridge" @@ -17658,15 +18348,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "deprecated" @@ -17708,5 +18398,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "horse" @@ -17916,11 +18606,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "barrier" @@ -17958,6 +18648,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "street" @@ -18013,7 +18703,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "highway_track" @@ -18069,8 +18759,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "rail" @@ -18091,5 +18781,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "services" @@ -18103,5 +18793,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "ford" @@ -18122,5 +18812,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "turningcircle" @@ -18135,5 +18825,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "emergency_access_point" @@ -18148,5 +18838,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "riverbank" @@ -18160,5 +18850,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "stream" @@ -18172,5 +18862,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "dock" @@ -18198,5 +18888,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "aqueduct" @@ -18364,13 +19054,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "manmade" @@ -18432,7 +19122,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "railwaypoint" @@ -18455,10 +19145,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "otherrail" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "railover" @@ -18488,6 +19178,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "oldrail" @@ -18532,6 +19222,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "aeroway" @@ -18545,5 +19235,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18565,5 +19255,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -18577,5 +19267,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "aeroway_light" @@ -18623,7 +19313,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "aerialway" @@ -18640,5 +19330,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "piste_easy" @@ -18653,5 +19343,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "piste_intermediate" @@ -18666,5 +19356,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "piste_advanced" @@ -18679,5 +19369,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "piste_expert" @@ -18692,5 +19382,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "piste_freeride" @@ -18705,5 +19395,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "piste_novice" @@ -18808,10 +19498,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "power" @@ -18824,8 +19514,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "pier" @@ -18839,5 +19527,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "pipeline" @@ -18965,12 +19653,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "leisure" @@ -18984,5 +19672,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "marina" @@ -19054,8 +19742,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "amenity" @@ -19157,10 +19845,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "amenity_traffic" @@ -19546,22 +20234,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "amenity_light" @@ -19593,6 +20281,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "light_water" @@ -19653,8 +20341,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "health" @@ -20007,26 +20695,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "shop" @@ -20098,8 +20786,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20249,9 +20937,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "tourism" @@ -20323,8 +21011,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historic" @@ -20395,8 +21083,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "green" @@ -20410,5 +21098,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "quarry" @@ -20422,5 +21110,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "landfill" @@ -20442,5 +21130,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "basin" @@ -20454,5 +21142,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "forest" @@ -20466,5 +21154,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "farmyard" @@ -20487,5 +21175,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "retail" @@ -20499,5 +21187,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industrial" @@ -20511,5 +21199,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "brownfield" @@ -20523,5 +21211,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "greenfield" @@ -20535,5 +21223,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "railland" @@ -20590,7 +21278,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "military" @@ -20604,5 +21292,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cemetery" @@ -20615,5 +21303,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "peak" @@ -20628,5 +21316,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "glacier" @@ -20640,5 +21328,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "volcano" @@ -20693,8 +21381,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "natural" @@ -20708,5 +21396,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "scrub" @@ -20720,5 +21408,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "heath" @@ -20732,5 +21420,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "wood" @@ -20744,5 +21432,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "mud" @@ -20756,5 +21444,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "beach" @@ -20832,8 +21520,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "route" @@ -20881,7 +21569,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "boundary" @@ -21023,10 +21711,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "place" @@ -21074,6 +21762,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "address" @@ -21304,10 +21992,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21355,4 +22043,32 @@ msgstr "Streets NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Add either site-josm.xml or Wiki Pages." + +#~ msgid "Commit comment" +#~ msgstr "Commit comment" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." +#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Could not download plugin: {0} from {1}" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21362,10 +22078,4 @@ #~ "move mouse. Select: Click." -#~ msgid "Commit comment" -#~ msgstr "Commit comment" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - #~ msgid "Charge" #~ msgstr "Charge" @@ -21377,4 +22087,13 @@ #~ 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 "Drawbridge" #~ msgstr "Drawbridge" @@ -21386,4 +22105,22 @@ #~ 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 "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "viaduct" @@ -21392,4 +22129,7 @@ #~ msgstr "sports" +#~ msgid "Delete and Download" +#~ msgstr "Delete and Download" + #~ msgid "Edit Drawbridge" #~ msgstr "Edit Drawbridge" @@ -21398,4 +22138,13 @@ #~ msgstr "Edit Portcullis" +#~ 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 "" +#~ "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." + #~ msgid "Remove route nodes" #~ msgstr "Remove route nodes" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 15801) +++ /applications/editors/josm/i18n/po/es.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-21 07:46+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-06 09:23+0000\n" "Last-Translator: Emilio Gomez Fernandez \n" "Language-Team: Spanish \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,70 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "" -"El sistema de proyección no puede ser leído en las preferencias. Usando " -"EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "La proyección no puede leerse desde las preferencias. Usando Mercartor" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Cambios no guardados" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Guardar y salir" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Descartar y salir" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -96,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -103,10 +102,10 @@ msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL malformada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -190,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Complementos" @@ -255,15 +254,15 @@ msgstr "Longitud" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Alinear nodos en círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -272,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -294,9 +294,9 @@ msgstr "Herramienta: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Algunos nodos están (casi) en la línea" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Por favor, selecciona al menos cuatro nodos." @@ -331,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflicto" @@ -475,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -484,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Borrar" @@ -494,14 +494,15 @@ msgstr "Eliminar objetos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "El archivo existe. ¿Sobreescribir?" @@ -531,9 +532,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -571,16 +572,4 @@ msgstr "Salir de la aplicación" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Archivos del servidor OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Archivos GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Archivos NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -654,12 +643,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -667,5 +656,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Error" @@ -686,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -802,4 +791,18 @@ msgstr "Unir {0} nodos" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -856,67 +859,25 @@ msgstr "sin nombre" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Abrir un archivo." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Error mientras se analizaba sintácticamente {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Extensión de archivos desconocida: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Marcadores desde {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Coordenadas importadas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Sentencias mal formadas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Errores de suma de verificación: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Sentencias desconocidas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Coordenadas cero: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Éxito en la importación NMEA" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "¡Fallo en la importación NMEA!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -992,5 +953,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Pegar" @@ -1021,5 +982,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Preferencias" @@ -1065,14 +1026,19 @@ msgstr "Cambiar el sentido de las vías" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Guardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Guardar los datos actuales." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1082,26 +1048,26 @@ "favor comunique esto como fallo." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Documento vacío" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "El documentos no contiene datos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Guardar igualmente" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflictos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1111,32 +1077,36 @@ "gestionarán si rechazas todo. ¿Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Rechazar conflictos y guardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Guardar el archivo OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Grabar el archivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Guardar el archivo OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "No se pudo salvaguardar el archivo." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Extensión de archivo desconocida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Ocurrió un error al guardar." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Ocurrió un error al restaurar el archivo de salvaguarda." @@ -1278,56 +1248,56 @@ msgstr "Cambiar de estado el ajuste global ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Despegar vías" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicar nodos usados por varias vías." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Selecione alguno:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que este usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Una vía que tiene un nodo o más usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1340,9 +1310,9 @@ "las vías obtendrán su propia copia y todos los nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Nodo despegado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1350,5 +1320,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1412,51 +1382,51 @@ "continuar?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Subir todos los cambios al servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objetos que añadir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objetos que modificar" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objetos que borrar" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "¿Subir estos cambios?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Subir cambios" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Ningún cambio que subir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1663,14 +1633,14 @@ msgstr "Añadir un nodo a la vía y conectar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Crear un nuevo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Seleccione un nodo con el cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1679,14 +1649,14 @@ msgstr[1] "Insertar un nuevo nodo en {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 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:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Continuar la vía desde el último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Finalizar dibujo." @@ -1706,5 +1676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Soltar el botón del ratón para seleccionar objetos en el rectángulo." @@ -1716,5 +1686,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Soltar el botón del ratón para parar de rotar." @@ -1752,5 +1722,5 @@ msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1759,5 +1729,5 @@ "más cercano." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1784,16 +1754,16 @@ "abajo, derecha, mover el zoom con el botón derecho\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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 por objetos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:46 +#: ../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 @@ -1801,53 +1771,63 @@ msgstr "No se han cargado los datos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "eliminar desde la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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 valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 +#: ../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:85 +#: ../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:May - sin 'May' en el nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1855,44 +1835,48 @@ "type: - tipo de objeto (nodo, vía, relación)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objetos con un número de nodos determinados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +"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 "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +"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 "" @@ -1900,5 +1884,5 @@ "lógico O (disyunción)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1906,46 +1890,46 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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 a la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1963,15 +1947,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "No se encuentran los argumentos de or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "No se encuentran los argumentos de not" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -2006,7 +2020,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Añadir" @@ -2046,4 +2060,8 @@ msgstr "Establecer {0}={1} para {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ChangeRelationMemberRole" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2051,66 +2069,10 @@ msgstr "Resolver conflictos {0} en objetos {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Relación con conclicto" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Borrar desde relación" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Mover" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2122,173 +2084,19 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Quitar miembro de la relación" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Rotar" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Secuencia" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "¿Aplicar?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Aplicar los cambios seleccionados" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "No aplicar cambios" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" -"Por favor, seleccione aquellos cambios de propiedades que desee aplicar." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Propiedades de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Roles en la relaciones referidos a" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Correción automática de etiquetas" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Archivo de configurar malformado en lineas {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, 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:338 -#, 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 desd el servidor." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 -msgid "different" -msgstr "diferente" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "borrado" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "verdadero" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falso" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "posición" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Grados decimales" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grados minutos segundos" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "incompleto" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Error: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Advertencia: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "vía" +msgstr[1] "vías" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2300,4 +2108,269 @@ msgstr[1] "relaciones" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Borrar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Relación con conclicto" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Borrar desde relación" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Mover" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Quitar miembro de la relación" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Rotar" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Secuencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "¿Aplicar?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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 aquellos cambios de propiedades que desee 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 configurar malformado en 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 desd el servidor." + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 +msgid "different" +msgstr "diferente" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "borrado" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "verdadero" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falso" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "posición" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Grados decimales" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grados minutos segundos" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Error: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Advertencia: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2332,138 +2405,129 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Estilo de área sin cerrar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "La vía multipoligonal ''{0}'' no está cerrada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Miembro vacío en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Borrado miembro ''{0}'' en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "La vía ''{0}'' con menos de dos puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Encontrado más de un \"desde\" en la vía." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Encontrado más de un \"hacia\" en la vía." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Encontrada más de una \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Rol desconocido ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo desconocido para el miembro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Ningún \"desde\" encontrado en la vía." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Ningún \"hacia\" encontrado en la vía." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "No se ha especificado una \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Stilo para la restricción {0} no encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "La no-vía ''{0}'' en multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ninguna vía exterior en el multipolígono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre las vías ''{0}'' y ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "El estilo de la vía exterior ''{0}'' no coincide." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "sin etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "texto" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "vía" -msgstr[1] "vías" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2485,5 +2549,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2570,4 +2634,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2582,4 +2647,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2791,26 +2857,26 @@ msgstr "La opción de configuración {0} ha sido eliminada y ya no se usa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2819,21 +2885,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Interruptor de la vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Cambiar vista a pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2943,4 +3009,493 @@ msgstr "Inicializar" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Etiquetas" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Miembros" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Eliminar" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rol" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2954,5 +3509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2984,9 +3539,9 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2994,25 +3549,69 @@ "en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Combinar conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Resolver conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflictos: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Advertencia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3177,10 +3776,4 @@ msgid "Member Of" msgstr "Miembro de" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rol" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3366,8 +3959,4 @@ msgstr "Etiquetas (un valor nulo borra la etiqueta)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Miembros" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3401,11 +3990,4 @@ msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Eliminar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3460,5 +4042,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3483,5 +4065,5 @@ msgstr "sí" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3508,24 +4090,24 @@ msgstr "no" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Miembros: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editor de relación: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Existieron conflictos durante la importación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Error analizando la respuesta del servidor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "No se puede conectar con el servidor" @@ -3785,10 +4367,4 @@ msgstr "Imagen con la ruta {0} no existe o no puede ser leida." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Advertencia" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3827,5 +4403,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3863,53 +4439,53 @@ msgstr "La hora no pudo ser analizada sintácticamente." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Personalice el dibujo de línea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Usar las preferencias globales" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "No dibujar las líneas entre puntos en esta capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Seleccione las opciones de dibujo de línea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Personalizar colores" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "Aceptar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3917,6 +4493,6 @@ msgstr "Predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3924,31 +4500,31 @@ msgstr "Seleccionar una color" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Marcadores desde puntos nombrados" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Puntos de traza nombrados desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importar audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "archivos Wave Audio (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Marcadores de audio desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importar imágenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3957,5 +4533,5 @@ msgstr[1] "{0} trazas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3964,5 +4540,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3971,28 +4547,28 @@ msgstr[1] "{0} nodos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nombre: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Descripción: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Rango de tiempo " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Longitud: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -4003,11 +4579,11 @@ "peligroso.
Si quiere subir trazas, consulte aquí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4017,29 +4593,29 @@ msgstr "Convertido desde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Descargar todo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4050,9 +4626,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4063,5 +4639,5 @@ "comienzo." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4080,24 +4656,24 @@ msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4133,5 +4709,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4140,5 +4716,5 @@ msgstr[1] "una traza con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4147,5 +4723,5 @@ msgstr[1] "{0} formado por las trazas {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4288,5 +4864,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Por favor, seleccione la fila a borrar" @@ -5348,5 +5924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 msgid "Draw large GPS points." -msgstr "Dibujar grandes los puntos de gps" +msgstr "Dibujar más grandes los puntos GPS" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 @@ -5624,5 +6200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77 msgid "Show object ID in selection lists" -msgstr "Mostrar la ID del objeto en las listas de selección" +msgstr "Mostrar el ID del objeto en las listas de selección" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34 @@ -5661,5 +6237,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Actualizar" @@ -5671,7 +6247,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Añadir site-josm.xml o bien Páginas Wiki" +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5679,4 +6254,8 @@ msgid "Please select an entry." msgstr "Por favor seleccione una entrada." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6067,5 +6646,5 @@ msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6076,15 +6655,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6094,18 +6673,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -6143,4 +6722,16 @@ msgstr "Preparando datos..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Archivos GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Marcadores desde {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" @@ -6148,4 +6739,37 @@ "Error en el análisis sintáctico: estructura de documento invalida para un " "documento gpx" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Archivos NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Coordenadas importadas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Sentencias mal formadas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +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 +msgid "Unknown sentences: " +msgstr "Sentencias desconocidas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Coordenadas cero: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Éxito en la importación NMEA" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "¡Fallo en la importación NMEA!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6182,5 +6806,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "No changeset present for diff upload" -msgstr "" +msgstr "Sin nuevos cambios que enviar" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 @@ -6205,4 +6829,13 @@ msgid "Unknown host" msgstr "Host desconocido" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6231,8 +6864,16 @@ msgstr "Abortando..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Error durante el análisis sintáctico." +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "Archivos del servidor OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6269,4 +6910,6 @@ msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" +"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, " +"valor {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 @@ -6276,7 +6919,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Borrado miembro ''{0}'' en la relación." +msgstr "" +"Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor {2}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6293,9 +6937,11 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" +"Valor no válido para el atributo \"version\" en la primitiva OSM con id {0}, " +"valor {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 @@ -6322,5 +6968,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6328,4 +6974,6 @@ "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/io/OsmServerReader.java:85 @@ -6344,15 +6992,20 @@ "tarde." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Actualizar complementos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Descarga de complementos" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6365,25 +7018,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" -"El complemento {0} se ha actualizado correctamente. Por favor reinicie JOSM" msgstr[1] "" -"Los complementos {0} se han actualizado correctamente. Por favor reinicie " -"JOSM" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "No se ha podido bajar el complemento: {0} al {1}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -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 "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6401,10 +7061,10 @@ "ya no es necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "El complemento requiere actualizar JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -6413,15 +7073,15 @@ "encontrado" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Complemento no encontrado: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6431,12 +7091,12 @@ "aviso
cambiando la opción de configuración 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Deshabilitar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -6444,9 +7104,9 @@ "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Mantener componente" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6456,5 +7116,5 @@ "permiso para escribir sobre los existentes" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6464,10 +7124,10 @@ "\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6476,9 +7136,9 @@ "informar del error." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "¿Se debe deshabilitar el complemento?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6488,5 +7148,5 @@ "JOSM para descargarle del programa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6496,19 +7156,19 @@ "administradores de JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "no hay descripción disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Más detalles" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6517,13 +7177,13 @@ msgstr[1] "Información del complemento descargada de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "No se ha encontrado información del complemento." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Todos los complementos instalados están actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6536,9 +7196,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Descargar los complementos que faltan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6551,10 +7211,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Descarga de complementos" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6577,41 +7233,14 @@ msgstr "desconocido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Complemento incluido en JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Ya existe el complemento." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Eliminar y descargar" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Error al borrar el archivo del complemento: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6765,9 +7394,4 @@ msgstr "Por favor, introduzca la descripción sobre su traza" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Etiquetas" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6940,4 +7564,9 @@ 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 +#, 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 @@ -7176,6 +7805,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Error al leer el archivo" @@ -7525,37 +8154,42 @@ "Seleccione primero una de ellas y reinténtelo" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Capa en blanco" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Capa WMS ({0}), {1} tesela(s) cargada" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "No está vectorizado." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Centro de la imágen ráster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Está vectorizado." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Cuadro de la Comunna: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7564,16 +8198,21 @@ msgstr "Cargar capa WMS desde archivo" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7584,9 +8223,9 @@ "Creado uno nuevo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Error en el formato caché" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7594,5 +8233,5 @@ "Zona Lambert {0} en la caché incompatible con la zona Lambert actual {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Error en la zona Lambert de la caché" @@ -7633,11 +8272,10 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Separar vía" +msgstr "Dividir área" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Dividir una área mediante una vía sin etiquetar" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -7647,4 +8285,7 @@ "Remove the area from the relation before splitting it." msgstr "" +"El área seleccionada no puede dividirse porque es miembro de alguna " +"relación.\n" +"Elimine el área de la relación antes de dividirlo." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8067,7 +8708,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "lámina de agua" @@ -8465,16 +9106,21 @@ msgstr "Estado de la cuestión desconocida" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Abrir visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Extensión de archivos desconocida: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8567,5 +9213,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8592,25 +9238,25 @@ msgstr "Abrir una lista de nodos de enrutamiento" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Agregar capa de enrutado" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Criterios" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "La más corta" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "La más rápida" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Ruta inversa" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Borrar ruta" @@ -8785,11 +9431,11 @@ msgstr "fin" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Editar etiquetas" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Lanza la ventana de dialogo del editor de etiquetas" @@ -8799,8 +9445,4 @@ msgstr "Componente JOSM Tag Editor" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(ninguno)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8811,5 +9453,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8818,5 +9460,5 @@ msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8838,8 +9480,14 @@ msgstr "Filtrar" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Limpiar" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9769,7 +10417,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "edificio" @@ -9783,5 +10431,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "área" @@ -9879,4 +10527,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9981,19 +10645,19 @@ "Esto puede dar lugar a unas coordenadas erróneas." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Descarga automática" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10002,17 +10666,17 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Canal alfa" @@ -10026,9 +10690,9 @@ msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Preferencias del componente WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" @@ -10039,43 +10703,43 @@ "para añadirlo a la lista superior de servidores mostrados)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nombre del menú" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Dirección URL del servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Nombre del menú (por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "Dirección URL del servicio WMS (Por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 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:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Copiar por defecto" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Por favor, seleccione una fila para copiar" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Teselas superpuestas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% de lat:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% de lon:" @@ -10157,5 +10821,5 @@ msgid "" "Creating and handling address nodes and buildings within Czech Republic." -msgstr "" +msgstr "Creación y manipulación de números de policía en la República Checa." #. Plugin DirectUpload @@ -10176,12 +10840,7 @@ #: build/trans_plugins.java:17 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 principal característica del componente es la posibilidad de eliminar los " -"puntos de una traza GPX. Se puede utilizar para preparar las trazas antes " -"subirlas a OSM para, por ejemplo, suprimir partes de la traza poco " -"interesantes." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10369,6 +11028,11 @@ "una corrector ortográfico para los nombres de las etiquetas." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11188,5 +11852,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privado" @@ -11234,5 +11898,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "destino" @@ -11269,5 +11933,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permisivo" @@ -11499,6 +12163,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "Autopista" @@ -11524,6 +12188,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "Carretera principal" @@ -11549,6 +12213,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "vía primaria" @@ -11574,6 +12238,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "vía secundaria" @@ -11587,5 +12251,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "carretera local" @@ -11603,5 +12267,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "calle urbana" @@ -11619,5 +12283,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "vía de servicio" @@ -11644,6 +12308,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "en construcción" @@ -11693,5 +12357,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rotonda" @@ -12671,5 +13335,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "marísma" @@ -14393,27 +15057,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "deporte" @@ -16772,5 +17436,5 @@ #: build/trans_presets.java:2762 msgid "Forest" -msgstr "Gran area bosque" +msgstr "Plantación forestal" #. item @@ -16825,5 +17489,5 @@ #: build/trans_presets.java:2793 msgid "Heath" -msgstr "Brezal" +msgstr "Brezal o landa" #. item @@ -16831,5 +17495,5 @@ #: build/trans_presets.java:2795 msgid "Edit Heath" -msgstr "Editar brezal" +msgstr "Editar brezal o landa" #. item "Land use/Heath" text "Name" @@ -16837,5 +17501,5 @@ #: build/trans_presets.java:2800 msgid "Farmyard" -msgstr "Corral" +msgstr "Edificio agrario" #. item @@ -16844,5 +17508,5 @@ #: build/trans_presets.java:2803 msgid "Edit Farmyard Landuse" -msgstr "Editar corral" +msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" @@ -16921,5 +17585,5 @@ #: build/trans_presets.java:2851 msgid "Common" -msgstr "Espacio de uso común" +msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" #. item @@ -17258,8 +17922,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bicicleta" @@ -17320,6 +17984,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17330,8 +17992,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "pie" @@ -17357,5 +18019,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17440,4 +18102,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17452,8 +18115,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17473,5 +18138,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "estándar" @@ -17561,7 +18226,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "puente" @@ -17825,15 +18490,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "obsoleto" @@ -17875,5 +18540,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "caballo" @@ -18083,11 +18748,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "barrera" @@ -18125,6 +18790,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "calle" @@ -18180,7 +18845,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "pista" @@ -18236,8 +18901,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "ferrocarril" @@ -18258,5 +18923,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "servicios" @@ -18270,5 +18935,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "vado" @@ -18289,5 +18954,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "círculo de giro" @@ -18302,5 +18967,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "Punto de acceso de emergencias" @@ -18315,5 +18980,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "ribera" @@ -18327,5 +18992,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "arroyo" @@ -18339,5 +19004,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "muelle" @@ -18365,5 +19030,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "acueducto" @@ -18531,13 +19196,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "hecho por el hombre" @@ -18599,7 +19264,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "punto ferroviario" @@ -18622,10 +19287,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "otros ferrocarriles" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "paso con más de un cruce ferroviario" @@ -18655,6 +19320,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "vía muerta" @@ -18699,6 +19364,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "aerovía" @@ -18712,5 +19377,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18732,5 +19397,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "pista (oscuro)" @@ -18744,5 +19409,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "pista (claro)" @@ -18790,7 +19455,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "pista de rodadura" @@ -18807,5 +19472,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "pista fácil" @@ -18820,5 +19485,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "pista intermedia" @@ -18833,5 +19498,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "pista avanzada" @@ -18846,5 +19511,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "pista para expertos" @@ -18859,5 +19524,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "pista de estilo libre" @@ -18872,5 +19537,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "pista para iniciados" @@ -18975,10 +19640,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "energía" @@ -18991,8 +19656,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "muelle" @@ -19006,5 +19669,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "tubería" @@ -19132,12 +19795,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "ocio" @@ -19151,5 +19814,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "puerto deportivo" @@ -19221,8 +19884,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "servicios" @@ -19324,10 +19987,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "tráfico de ocio" @@ -19713,22 +20376,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "equipamiento lumínico" @@ -19760,6 +20423,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "agua (claro)" @@ -19820,8 +20483,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "salud" @@ -20174,26 +20837,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "tienda" @@ -20265,8 +20928,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20416,9 +21079,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turismo" @@ -20490,8 +21153,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "patrimonio histórico" @@ -20562,8 +21225,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "zona verde" @@ -20577,5 +21240,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "cantera" @@ -20589,5 +21252,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "vertedero" @@ -20609,5 +21272,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "cuenca" @@ -20621,7 +21284,7 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" -msgstr "gran area bosque" +msgstr "plantación forestal" #. color residential @@ -20633,7 +21296,7 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" -msgstr "corral" +msgstr "edificio agrario" #. color farmyard @@ -20654,5 +21317,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "venta al por menor" @@ -20666,5 +21329,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industrial" @@ -20678,5 +21341,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "área postindustrial degradada" @@ -20690,5 +21353,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "área rururbana" @@ -20702,5 +21365,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "zona ferroviaria" @@ -20757,7 +21420,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "zona militar" @@ -20771,5 +21434,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cementerio" @@ -20782,5 +21445,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "pico" @@ -20795,5 +21458,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "glaciar" @@ -20807,5 +21470,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "volcán" @@ -20860,8 +21523,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "espacio natural" @@ -20875,5 +21538,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "matorral" @@ -20887,5 +21550,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "monte" @@ -20899,5 +21562,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "bosque" @@ -20911,5 +21574,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "lodazal" @@ -20923,5 +21586,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "playa" @@ -20999,8 +21662,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "ruta" @@ -21048,7 +21711,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "frontera" @@ -21190,10 +21853,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "lugar" @@ -21241,6 +21904,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "dirección" @@ -21471,10 +22134,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21522,4 +22185,36 @@ msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Añadir site-josm.xml o bien Páginas Wiki" + +#~ msgid "Commit comment" +#~ msgstr "Envíe comentario" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie " +#~ "JOSM" +#~ msgstr[1] "" +#~ "Los complementos {0} se han actualizado correctamente. Por favor reinicie " +#~ "JOSM" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "No se ha podido bajar el complemento: {0} al {1}" + +#~ msgid "Navigation" +#~ msgstr "Navegación" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21529,10 +22224,4 @@ #~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click" -#~ msgid "Commit comment" -#~ msgstr "Envíe comentario" - -#~ msgid "Navigation" -#~ msgstr "Navegación" - #~ msgid "Charge" #~ msgstr "Pago" @@ -21544,4 +22233,13 @@ #~ 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 "Drawbridge" #~ msgstr "Puente levadizo" @@ -21553,4 +22251,22 @@ #~ 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 "" +#~ "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 "viaduct" #~ msgstr "viaducto" @@ -21559,4 +22275,7 @@ #~ msgstr "Deportes" +#~ msgid "Delete and Download" +#~ msgstr "Eliminar y descargar" + #~ msgid "Edit Drawbridge" #~ msgstr "Editar un puente levadizo" @@ -21565,4 +22284,14 @@ #~ msgstr "Editar rastrillo" +#~ 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 principal característica del componente es la posibilidad de eliminar " +#~ "los puntos de una traza GPX. Se puede utilizar para preparar las trazas " +#~ "antes subirlas a OSM para, por ejemplo, suprimir partes de la traza poco " +#~ "interesantes." + #~ msgid "Remove route nodes" #~ msgstr "Eliminar nodos de ruta" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 15801) +++ /applications/editors/josm/i18n/po/et.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 17:49+0000\n" -"Last-Translator: lyyser \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-07 16:39+0000\n" +"Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:15+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,68 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "Projektsioon ei olnud eelistustest loetav. Kasutan Mercatori." + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Salvestamata muudatused" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Salvesta ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Tühista ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -94,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -101,10 +102,10 @@ msgstr "Katkesta" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -188,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Pistikud" @@ -253,15 +254,15 @@ msgstr "Pikkuskraad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Paiguta sõlmed ringikujuliselt." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Liiguta valitud sõlmed ringiks." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -270,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -292,9 +294,9 @@ msgstr "Tööriist {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Mõned sõlmed on enam-vähem ühel joonel." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Palun vali vähemalt neli sõlme." @@ -329,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -335,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "download" -msgstr "Lae alla" +msgstr "allalaetule" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 @@ -341,5 +343,5 @@ #, java-format msgid "Zoom to {0}" -msgstr "Zuumi {0}" +msgstr "Suumi {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 @@ -470,5 +472,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -479,7 +481,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Kustuta" @@ -489,14 +491,15 @@ msgstr "Kustuta valitud objektid." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Ülekirjutamine" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Fail eksisteerib! Kas kirjutada see üle?" @@ -524,9 +527,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -564,16 +567,4 @@ msgstr "Rakenduse sulgemine." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM serveri failid" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX failid" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 failid" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -645,12 +636,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -658,5 +649,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Viga" @@ -677,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -790,4 +781,18 @@ msgstr "Sulanda {0} sõlm(e)" +#: ../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:70 +msgid "Mirror" +msgstr "Peegelda" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "Peegelda valitud sõlmed ja teed." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Palun vali vähemalt üks sõlm või tee." + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -844,67 +849,25 @@ msgstr "Nimetu" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Ava..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Faili avamine." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Viga {0} parsimisel" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Tundmatu faililaiend: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markerid {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Koordinaadid imporditud: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Vigaselt vormindatud laused: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Kontrollsumma vead: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Tundmatud laused: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Null koordinaadid: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA import oli edukas." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA impordi viga!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -978,5 +941,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Kleebi" @@ -1005,5 +968,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Eelistused" @@ -1049,14 +1012,19 @@ msgstr "Pööra teede suund." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Salvesta" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Salvesta praegused andmed" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Fail {0} on juba olemas. Kas kirjutan üle?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1066,26 +1034,26 @@ "sellest veast arendajaid." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tühi dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokumendis ei ole andmeid." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Salvesta ikkagi." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konfliktid" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1095,32 +1063,36 @@ "tagasi. Jätkame?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Lahenda vastuolud ja salvesta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Salvesta OSM fail." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Salvesta GPX fail" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Salvesta OSM fail." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Salvesta kiht" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Ei saa faili varundada." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Tundmatu faililaiend." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Salvestamisel ilmnes viga." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Varundatud faili taastamisel ilmnes viga" @@ -1258,55 +1230,55 @@ msgstr "Näita/peida seade {0}" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Kleebi tee uuesti kokku." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Kahekordista sõlmed, mis on mitme tee poolt kasutatud." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "See on üksik sõlm." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Vali miski:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* üks sildiga sõlm või" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui ühes neist " +"teedest" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui ühes neist " -"teedest" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1314,5 +1286,5 @@ "ühes neist teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1325,9 +1297,9 @@ "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Lahtisulatatud sõlm" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1335,5 +1307,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1393,50 +1365,50 @@ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Lae OSMi serverisse" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Lae kõik muudatused OSM serverisse üles." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objektid lisada:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objektid muuta:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objektid kustutada:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Kas laen need muudatused üles?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Lae muudatused üles" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Pole muudatusi mida üles laadida." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1480,5 +1452,5 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 msgid "Faster Forward" -msgstr "" +msgstr "Kiiremini edasi" #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 @@ -1541,5 +1513,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44 msgid "Downloading data" -msgstr "Admete allalaadmine" +msgstr "Andmete allalaadimine" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62 @@ -1550,5 +1522,5 @@ #, java-format msgid "Data Layer {0}" -msgstr "" +msgstr "Andmekiht {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83 @@ -1563,9 +1535,9 @@ #, java-format msgid "Download {0} of {1} ({2} left)" -msgstr "" +msgstr "Laen alla {0} {1}-st ({2} veel)" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88 msgid "The following errors occured during mass download:" -msgstr "" +msgstr "Mass-allalaadimisel leidsid aset järgmised vead:" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89 @@ -1575,5 +1547,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 msgid "Delete Mode" -msgstr "" +msgstr "Kustutusrežiim" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 @@ -1588,5 +1560,5 @@ #, java-format msgid "Mode: {0}" -msgstr "" +msgstr "Režiim: {0}" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 @@ -1638,16 +1610,16 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506 msgid "Add node into way and connect" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +msgstr "Lisa sõlm teele ja ühenda" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +msgstr "Loo uus sõlm." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Vali kursori all olev sõlm." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1656,16 +1628,16 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "Alusta uut teed viimasest sõlmest." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +msgstr "Jätke teed viimasest sõlmest." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." -msgstr "" +msgstr "Lõpeta joonistamine." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 @@ -1683,5 +1655,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1692,5 +1664,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "" @@ -1725,10 +1697,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1751,16 +1723,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1768,145 +1740,155 @@ msgstr "Andmeid ei laetud." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +msgstr "tõstutundlik" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +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:83 +#: ../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:84 +#: ../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:85 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "foot: - key=foot set to any value." -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "Special targets:" +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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1920,14 +1902,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "" @@ -1963,7 +1975,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lisa" @@ -1971,5 +1983,5 @@ #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45 msgid "Change" -msgstr "" +msgstr "Muuda" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96 @@ -1990,6 +2002,6 @@ msgid "object" msgid_plural "objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "objekt" +msgstr[1] "objektid" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -2003,4 +2015,8 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2008,58 +2024,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Liiguta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2071,167 +2039,19 @@ msgstr[1] "punktid" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Ei suuda avada eelistuste kataloogi: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "tee" +msgstr[1] "teed" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2243,4 +2063,255 @@ msgstr[1] "seosed" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Kustuta {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Kustuta {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Konfliktne relatsioon" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Liiguta" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Jada" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2273,140 +2344,131 @@ msgid_plural "{0} nodes" msgstr[0] "{0} punkt" -msgstr[1] "{0} punktid" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +msgstr[1] "{0} punkti" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "tee" -msgstr[1] "teed" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2428,5 +2490,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2497,4 +2559,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2509,4 +2572,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2715,26 +2779,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Fail" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Tööriistad" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Eelseaded" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2743,21 +2807,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Lülita joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Heli" @@ -2867,4 +2931,493 @@ msgstr "" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Liikmed" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Eemalda" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Roll" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2878,5 +3431,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2908,33 +3461,77 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Lahenda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Vastuolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Ühendan vastuolusid." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Lahenda konfliktid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konfliktid: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3096,10 +3693,4 @@ msgid "Member Of" msgstr "On liikmeks järgnevas" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Roll" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3284,8 +3875,4 @@ msgstr "Sildid (tühi väärtus kustutab sildi)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Liikmed" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3319,11 +3906,4 @@ msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Eemalda" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3378,5 +3958,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3401,5 +3981,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3426,24 +4006,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Liikmed: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Importimisel tekkisid konfliktid." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Viga serveri vastuse töötlemisel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Ei saa serveriga ühenduda." @@ -3698,10 +4278,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3740,5 +4314,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3776,53 +4350,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +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 +msgid "Use global settings." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 -msgid "Customize line drawing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 -msgid "Use global settings." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 msgid "Draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Kohanda värvi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3830,6 +4404,6 @@ msgstr "Vaikimisi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3837,31 +4411,31 @@ msgstr "Vali värv" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Heli import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Piltide import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3870,5 +4444,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3877,5 +4451,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3884,28 +4458,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Muuda andme kihiks" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3916,11 +4490,11 @@ "kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3930,29 +4504,29 @@ msgstr "Muudetud sellest: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3961,9 +4535,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3971,5 +4545,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3986,24 +4560,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} kustutatud.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4037,7 +4611,7 @@ msgid_plural "points" msgstr[0] "punkt" -msgstr[1] "punkti" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +msgstr[1] "punktid" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4046,5 +4620,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4053,5 +4627,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4186,5 +4760,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Palun vali rida kustutamiseks" @@ -5518,5 +6092,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Uuenda" @@ -5528,6 +6102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5535,4 +6108,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5890,5 +6467,5 @@ msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5899,15 +6476,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5917,18 +6494,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Muuda seadeid" @@ -5966,8 +6543,53 @@ msgstr "Valmistan andmeid ette..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX failid" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markerid {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Parse error: vigane gpx dokumendi struktuur" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 failid" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Koordinaadid imporditud: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Vigaselt vormindatud laused: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Kontrollsumma vead: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Tundmatud laused: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Null koordinaadid: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA import oli edukas." + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA impordi viga!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6024,4 +6646,13 @@ msgid "Unknown host" msgstr "Tundmatu host" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6050,8 +6681,16 @@ msgstr "Katkestan..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM serveri failid" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6101,5 +6740,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 msgid "Incomplete specification with ref=0" -msgstr "Puudulik määramine ref=0" +msgstr "Puudulik määratlus ref=0" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 @@ -6141,5 +6780,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6161,15 +6800,20 @@ "uuesti ." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Uuenda pistikuid" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6182,22 +6826,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} Pistik edukalt uuendatud. Palun taaskäivita JOSM." -msgstr[1] "{0} Pistikud edukalt uuendatud. Palun taaskäivita JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla laadida." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6213,25 +6867,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6239,21 +6893,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6261,5 +6915,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6267,19 +6921,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6287,5 +6941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6293,19 +6947,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "kirjeldust pole saadaval" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6314,13 +6968,13 @@ msgstr[1] "Laadisin alla pluginate info {0} saidilt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Pluginate infot ei leitud" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Kõik installeeritud pluginad on uuendatud." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6333,9 +6987,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Lae alla puuduvad pluginad" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6348,10 +7002,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6374,37 +7024,14 @@ msgstr "tundmatu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versioon {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin kaasatud JOSMi" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6550,9 +7177,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6720,4 +7342,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Viga {0} parsimisel" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -6939,6 +7566,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -7255,36 +7882,41 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" msgstr "" @@ -7294,16 +7926,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7312,14 +7949,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7360,7 +7997,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Lahuta tee." +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7791,7 +8427,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "" @@ -8167,16 +8803,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Tundmatu faililaiend: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8263,5 +8904,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8288,25 +8929,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8479,11 +9120,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8493,8 +9134,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8505,5 +9142,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8512,5 +9149,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8532,7 +9169,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9420,7 +10063,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "" @@ -9434,5 +10077,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9522,4 +10165,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9596,36 +10255,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9639,51 +10298,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9769,7 +10428,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9919,6 +10577,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10736,5 +11399,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10782,5 +11445,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10817,5 +11480,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11047,6 +11710,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11072,6 +11735,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11097,6 +11760,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "" @@ -11122,6 +11785,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "" @@ -11135,5 +11798,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11151,5 +11814,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "" @@ -11167,5 +11830,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11192,6 +11855,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11241,5 +11904,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "" @@ -12218,5 +12881,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -13940,27 +14603,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "" @@ -15085,5 +15748,5 @@ #: build/trans_presets.java:2186 msgid "Man Made" -msgstr "" +msgstr "Inimtekkeline" #. group "Man Made" @@ -15403,5 +16066,5 @@ #: build/trans_presets.java:2329 msgid "Recycling" -msgstr "Taasringlus" +msgstr "Jäätmekäitlus" #. item @@ -15410,5 +16073,5 @@ #: build/trans_presets.java:2332 msgid "Edit Recycling station" -msgstr "Vali taasringlus jaam" +msgstr "Muuda jäätmekäitlusjaam" #. item "Amenities/Recycling" label "Edit Recycling station" @@ -16798,8 +17461,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "jalgrattaga" @@ -16860,6 +17523,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16870,8 +17531,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "jalgsi" @@ -16897,5 +17558,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metroo" @@ -16980,4 +17641,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -16992,8 +17654,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17013,5 +17677,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17101,7 +17765,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "sild" @@ -17365,15 +18029,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "kasutusest väljas" @@ -17415,5 +18079,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "hobused" @@ -17623,11 +18287,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17665,6 +18329,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "tänav" @@ -17720,7 +18384,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "teerada" @@ -17776,8 +18440,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "ääris" @@ -17798,5 +18462,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17810,5 +18474,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17829,5 +18493,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "tagasipööramisring" @@ -17842,5 +18506,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17855,5 +18519,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "jõekallas" @@ -17867,5 +18531,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "oja" @@ -17879,5 +18543,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "dokk" @@ -17905,7 +18569,7 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" -msgstr "akveadukt" +msgstr "akvedukt" #. color aqueduct @@ -18071,13 +18735,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "inimtekkeline" @@ -18139,7 +18803,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "raudteevärk" @@ -18162,10 +18826,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "muu rööbastee" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "ülarelss" @@ -18195,6 +18859,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "kasutamata raudtee" @@ -18239,6 +18903,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "aeronautika" @@ -18252,5 +18916,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "lennuterminal" @@ -18272,5 +18936,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "helikopterid" @@ -18284,5 +18948,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "kerglennukid" @@ -18330,7 +18994,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "trosstransport" @@ -18347,5 +19011,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "suusanõlv lihtne" @@ -18360,5 +19024,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "suusanõlv keskmine" @@ -18373,5 +19037,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "suusanõlv edasijõudnutele" @@ -18386,5 +19050,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18399,5 +19063,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "suusanõlv klassita" @@ -18412,5 +19076,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "suusanõlv algajale" @@ -18515,10 +19179,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "elektrivarustus" @@ -18531,8 +19195,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "kai" @@ -18546,5 +19208,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "torujuhe" @@ -18672,12 +19334,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "puhkealad" @@ -18691,5 +19353,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "paadisadam" @@ -18761,8 +19423,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "mugavused" @@ -18864,10 +19526,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "autohooldus" @@ -19253,22 +19915,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "muud mugavused" @@ -19300,6 +19962,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "vesi" @@ -19360,8 +20022,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "tervishoid" @@ -19714,26 +20376,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "pood" @@ -19805,8 +20467,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotell" @@ -19956,9 +20618,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turism" @@ -20030,8 +20692,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "alalooline" @@ -20102,8 +20764,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "roheline" @@ -20117,5 +20779,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "kivimurd" @@ -20129,5 +20791,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "prügimägi" @@ -20149,5 +20811,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "tehisjärv" @@ -20161,5 +20823,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "kultuurmets" @@ -20173,5 +20835,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "taluõu" @@ -20194,5 +20856,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "kaubandus" @@ -20206,5 +20868,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "tööstus" @@ -20218,5 +20880,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "jäätmaa" @@ -20230,5 +20892,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "rohepiirkond" @@ -20242,5 +20904,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "raudteede piirkond" @@ -20297,7 +20959,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "militaarala" @@ -20311,5 +20973,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "kalmistu" @@ -20322,5 +20984,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "mäetipp" @@ -20335,5 +20997,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "liustik" @@ -20347,5 +21009,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulkaan" @@ -20400,8 +21062,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "looduslik" @@ -20415,5 +21077,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "põõsastik" @@ -20427,5 +21089,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "nõmm" @@ -20439,5 +21101,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "mets" @@ -20451,5 +21113,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "muda" @@ -20463,5 +21125,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "rand" @@ -20539,8 +21201,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "teekond" @@ -20588,7 +21250,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "piir" @@ -20730,10 +21392,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "koht" @@ -20781,6 +21443,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "aadress" @@ -21011,10 +21673,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21061,2 +21723,26 @@ msgid "Streets NRW Geofabrik.de" msgstr "Tänavad NRW Geofabrik.de" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Could not download plugin: {0} from {1}" +#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla " +#~ "laadida." + +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 15801) +++ /applications/editors/josm/i18n/po/fi.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 08:58+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:52+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Finnish \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,70 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"Karttaprojektiota ei löydy ohjelman asetustiedostosta. Käytetään projektiota " -"EPSG:4326." - -#: ../core/src/org/openstreetmap/josm/Main.java:347 + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Tallentamattomia muutoksia" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Tallenna ja poistu" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Poistu tallentamatta" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -96,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -103,10 +102,10 @@ msgstr "Peruuta" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -190,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Liitännäiset" @@ -255,15 +254,15 @@ msgstr "Pituusaste" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Siirrä pisteet ympyrän kehälle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Siirtää valitut pisteet ympyrän kehälle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -272,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -294,9 +294,9 @@ msgstr "Työkalu: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Jotkin pisteet ovat (melkein) viivalla" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Valitse ainakin neljä pistettä." @@ -331,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "ristiriita" @@ -473,5 +473,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -482,7 +482,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Poista" @@ -492,14 +492,15 @@ msgstr "Poista valitut objektit." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Korvaa" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Tiedosto on jo olemassa. Korvataanko?" @@ -527,9 +528,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -567,16 +568,4 @@ msgstr "Poistu ohjelmasta." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM-palvelintiedostot" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX-tiedostot" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 -tiedostot" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -650,12 +639,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -663,5 +652,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Virhe" @@ -682,5 +671,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -795,4 +784,18 @@ msgstr "Yhdistä {0} pistettä" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -849,67 +852,25 @@ msgstr "nimetön" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Avaa..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Avaa tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Virhe tulkittaessa {0}:aa" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Tuntematon tiedostopääte: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Merkinnät: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Tuodut koordinaatit: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Tarkistussummavrihe: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA-tuonti onnistui" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA-tuonti epäonnistui" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -984,5 +945,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Liitä" @@ -1011,5 +972,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Asetukset" @@ -1055,14 +1016,19 @@ msgstr "Käännä polut" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Tallenna" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Tallenna tämänhetkinen data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1072,26 +1038,26 @@ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tyhjä dokumentti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokumentti ei sisällä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Tallenna silti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Ristiriidat" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1101,32 +1067,36 @@ "ristiriidoista. Jatka tallennusta?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Hylkää ristiriidat ja tallenna" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Tallenna OSM-tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Tallenna GPX-tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Tallenna OSM-tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Tiedostoa ei voitu varmuuskopioida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Tuntematon tiedostopääte." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Tallennettaessa tapahtui virhe." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Varmuuskopion palauttamisessa tapahtui virhe." @@ -1266,55 +1236,55 @@ msgstr "Vaihda asetuksen \"{0}\" tila" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Erota polut" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Monistaa pisteet, jotka ovat monen polun käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Valitse joko:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Yksi piste jolla on tageja, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Yksi polku, jossa on yksi tai useampi piste, jotka ovat myös muiden " +"polkujen käytössä, tai" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Yksi polku, jossa on yksi tai useampi piste, jotka ovat myös muiden " -"polkujen käytössä, tai" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1322,5 +1292,5 @@ "käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1333,9 +1303,9 @@ "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1343,5 +1313,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1402,51 +1372,51 @@ "jatkaa?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Lähetä OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Lisättävät objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Muokattavat objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Poistettavat objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Lähetetäänkö nämä muutokset?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Lähetä muutokset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Ei lähetettäviä muutoksia." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1653,14 +1623,14 @@ msgstr "Lisää piste polkuun ja yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Luo uusi piste." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Valitse kursorin alla oleva piste." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1669,14 +1639,14 @@ msgstr[1] "Lisää uusi piste {0} polkuun." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Aloita uusi polku viimeisestä pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Jatka polkua viimeisestä pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Lopeta piirtäminen." @@ -1696,5 +1666,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." @@ -1706,5 +1676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." @@ -1739,10 +1709,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1767,16 +1737,16 @@ "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1784,145 +1754,155 @@ msgstr "Ei dataa ladattuna." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "foot: - key=foot set to any value." -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "Special targets:" +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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1939,15 +1919,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1982,7 +1992,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lisää" @@ -2022,4 +2032,8 @@ msgstr "Aseta {0}={1} kohteelle {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2027,65 +2041,10 @@ msgstr "Ratkaise {0} ristiriitaa {1} objektissa" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Poista {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Poista {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Ristiriidassa oleva relaatio" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Poista relaatiosta" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Siirrä" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2097,171 +2056,19 @@ msgstr[1] "pistettä" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Kierrä" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Komentosarja" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Toteutetaanko?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Toteuta valtiut muutokset" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Älä toteuta muutoksia" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Ominaisuudet: " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automaattinen tagien korjaus" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Omien asetusten hakemistoa {0} ei voi avata." - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "eri" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "poistettu" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "tosi" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "epätosi" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "sijainti" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Asteina desimaalilukuna" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Asteina, minuutteina ja sekunteina" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "P" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "L" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "I" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "keskeneräinen" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Virhe: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Varoitus: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "polku" +msgstr[1] "polkua" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2273,4 +2080,266 @@ msgstr[1] "relaatiot" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Poista {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Poista {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Ristiriidassa oleva relaatio" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Siirrä" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Kierrä" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Komentosarja" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Toteutetaanko?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "eri" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "poistettu" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "tosi" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "epätosi" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "sijainti" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Asteina desimaalilukuna" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Asteina, minuutteina ja sekunteina" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "P" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "L" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "I" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "keskeneräinen" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Virhe: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Varoitus: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2305,139 +2374,130 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Poistettu jäsen \"{0}\" relaatiossa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Löytyi enemmän kuin yksi \"from\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Löytyi enemmän kuin yksi \"to\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Useita \"via\" -jäseniä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Tuntematon rooli \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Ei \"from\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Ei \"to\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Kiellolle {0} ei löydy piirtotyyliä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "ei tageja" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "teksti" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "polku" -msgstr[1] "polkua" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2459,5 +2519,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2533,4 +2593,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2545,4 +2606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2745,26 +2807,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2773,21 +2835,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Rautalankanäkymä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Vaihda rautalankanäkymän päälläoloa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Koko näyttö -tila" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Ääni" @@ -2897,4 +2959,493 @@ msgstr "Alustetaan" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Tagit" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Jäsenet" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Poista" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rooli" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2909,5 +3460,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2938,33 +3489,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Selvitä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Ristiriita" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Yhdistämisristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Ratkaise ristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Ratkaise ristiriita" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Ristiriidat: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Varoitus" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3126,10 +3721,4 @@ msgid "Member Of" msgstr "Jäsenyydet" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rooli" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3315,8 +3904,4 @@ msgstr "Tagit (tyhjä arvo poistaa tagin)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Jäsenet" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3350,11 +3935,4 @@ msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Poista" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3409,5 +3987,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3432,5 +4010,5 @@ msgstr "kyllä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3457,24 +4035,24 @@ msgstr "ei" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Jäsenet: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relaatioeditori: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Tuonnin aikana oli ristiriitoja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Virhe palvelimen vastauksen käsittelyssä." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Palvelimeen ei voida yhdistää." @@ -3732,10 +4310,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Varoitus" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3774,5 +4346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3810,53 +4382,53 @@ msgstr "Syötettyä aikaa ei voitu tulkita oikein." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps-piste" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Muokkaa viivanpiirtotyyliä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Käytä globaaleja asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Viivanpiirtoasetukset" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Muokkaa väriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3864,6 +4436,6 @@ msgstr "Oletusarvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3871,31 +4443,31 @@ msgstr "Valitse väri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Tuo äänitiedosto" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Ääniaaltotiedostot (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Tuo kuvia" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3904,5 +4476,5 @@ msgstr[1] "{0} jälkeä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3911,5 +4483,5 @@ msgstr[1] "{0} reittiä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3918,28 +4490,28 @@ msgstr[1] "{0} reittipistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nimi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Kuvaus: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Ajanjakso: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Pituus: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Muuta datatasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3950,11 +4522,11 @@ "haitallisena.
Jos haluat lähettää jälkiä, katso:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3964,29 +4536,29 @@ msgstr "Muutettu jäljestä {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3995,9 +4567,9 @@ msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4005,5 +4577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4020,24 +4592,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} poistettu)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4073,5 +4645,5 @@ msgstr[1] "pisteet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4080,5 +4652,5 @@ msgstr[1] "jälki, jossa on {0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4087,5 +4659,5 @@ msgstr[1] "{0}:ssä on {1} jälkeä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4218,5 +4790,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Ole hyvä ja valitse poistettava rivi." @@ -5558,5 +6130,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Päivitä" @@ -5568,7 +6140,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5576,4 +6147,8 @@ msgid "Please select an entry." msgstr "Valitse kohta." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5949,5 +6524,5 @@ msgstr "Tuntematon tyyppi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5958,15 +6533,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5976,18 +6551,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -6025,8 +6600,53 @@ msgstr "Valmistellaan karttatietoja..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX-tiedostot" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Merkinnät: {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen." +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 -tiedostot" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Tuodut koordinaatit: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Tarkistussummavrihe: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA-tuonti onnistui" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA-tuonti epäonnistui" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6083,4 +6703,13 @@ msgid "Unknown host" msgstr "Tuntematon palvelin" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6109,8 +6738,16 @@ msgstr "Keskeytetään..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM-palvelintiedostot" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6154,7 +6791,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Poistettu jäsen \"{0}\" relaatiossa." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6200,5 +6837,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6220,15 +6857,20 @@ "myöhemmin uudestaan." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Päivitä liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Lataa liitännäiset" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6241,27 +6883,32 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" -"{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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata " -"automaattisesti." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6279,10 +6926,10 @@ "tarpeellinen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -6290,15 +6937,15 @@ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Liitännäistä ei löytynyt: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6308,21 +6955,21 @@ "
asettamalla ”plginmanager.warntime”-asetuksen)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Poista liitännäinen käytöstä" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6332,5 +6979,5 @@ "on oikeus korvata vanhat tiedostot." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6338,10 +6985,10 @@ msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6349,9 +6996,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6361,5 +7008,5 @@ "liitännäisen käytöstä." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6367,19 +7014,19 @@ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Tiedot" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "kuvausta ei ole saatavilla" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6388,13 +7035,13 @@ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Liitännäistietoja ei löytynyt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Kaikki asennetut liitännäiset ovat ajantasalla." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6407,9 +7054,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Lataa puuttuvat liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6422,10 +7069,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Lataa liitännäiset" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6448,41 +7091,14 @@ msgstr "tuntematon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versio {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Liitännäinen tulee JOSM:n mukana" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Liitännäinen on jo olemassa" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja " -"poistaa nykyisen paketin?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6634,9 +7250,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Tagit" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6808,4 +7419,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Virhe tulkittaessa {0}:aa" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7031,6 +7647,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" @@ -7347,37 +7963,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Tyhjä taso" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7386,16 +8007,21 @@ msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7404,14 +8030,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7452,7 +8078,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Katkaise polku" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7883,7 +8508,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "vesi" @@ -8273,16 +8898,21 @@ msgstr "Tuntematon ongelman tila" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Avaa näkymään osuvat..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Tuntematon tiedostopääte: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8373,5 +9003,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8398,25 +9028,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8589,11 +9219,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8603,8 +9233,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8615,5 +9241,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8622,5 +9248,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8642,7 +9268,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9559,7 +10191,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "rakennus" @@ -9573,5 +10205,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "alue" @@ -9666,4 +10298,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9739,19 +10387,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automaattinen lataus" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9760,17 +10408,17 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9784,51 +10432,51 @@ msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "WMS-liitännäisen asetukset" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9916,7 +10564,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10066,6 +10713,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10883,5 +11535,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "yksityinen" @@ -10929,5 +11581,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "määränpää" @@ -10964,5 +11616,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11194,6 +11846,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "moottoritie" @@ -11219,6 +11871,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "valtatie" @@ -11244,6 +11896,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "kantatie" @@ -11269,6 +11921,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "seututie" @@ -11282,5 +11934,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "yhdystie" @@ -11298,5 +11950,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "asuinkatu" @@ -11314,5 +11966,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11339,6 +11991,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11388,5 +12040,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "kiertoliittymä" @@ -12365,5 +13017,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "suo" @@ -14087,27 +14739,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "urheilu" @@ -16945,8 +17597,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "polkupyörä" @@ -17007,6 +17659,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17017,8 +17667,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -17044,5 +17694,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17127,4 +17777,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17139,8 +17790,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17160,5 +17813,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17248,7 +17901,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "silta" @@ -17512,15 +18165,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17562,5 +18215,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17770,11 +18423,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17812,6 +18465,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "" @@ -17867,7 +18520,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17923,8 +18576,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17945,5 +18598,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17957,5 +18610,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17976,5 +18629,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "kääntöympyrä" @@ -17989,5 +18642,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18002,5 +18655,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "" @@ -18014,5 +18667,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "" @@ -18026,5 +18679,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -18052,5 +18705,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18218,13 +18871,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18286,7 +18939,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18309,10 +18962,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18342,6 +18995,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18386,6 +19039,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18399,5 +19052,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminaali" @@ -18419,5 +19072,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18431,5 +19084,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18477,7 +19130,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "köysirata" @@ -18494,5 +19147,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18507,5 +19160,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18520,5 +19173,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18533,5 +19186,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18546,5 +19199,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18559,5 +19212,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18662,10 +19315,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18678,8 +19331,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "laituri" @@ -18693,5 +19344,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "" @@ -18819,12 +19470,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18838,5 +19489,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18908,8 +19559,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -19011,10 +19662,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19400,22 +20051,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19447,6 +20098,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19507,8 +20158,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19861,26 +20512,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "kauppa" @@ -19952,8 +20603,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotelli" @@ -20103,9 +20754,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turismi" @@ -20177,8 +20828,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historiallinen" @@ -20249,8 +20900,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20264,5 +20915,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "louhos" @@ -20276,5 +20927,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "kaatopaikka" @@ -20296,5 +20947,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "valuma-alue" @@ -20308,5 +20959,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "talousmetsä" @@ -20320,5 +20971,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20341,5 +20992,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20353,5 +21004,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "" @@ -20365,5 +21016,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20377,5 +21028,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20389,5 +21040,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20444,7 +21095,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "" @@ -20458,5 +21109,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "hautausmaa" @@ -20469,5 +21120,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "huippu" @@ -20482,5 +21133,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "jäätikkö" @@ -20494,5 +21145,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "tulivuori" @@ -20547,8 +21198,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20562,5 +21213,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "pusikko" @@ -20574,5 +21225,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "nummi" @@ -20586,5 +21237,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "metsä" @@ -20598,5 +21249,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "muta" @@ -20610,5 +21261,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "ranta" @@ -20686,8 +21337,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "reitti" @@ -20735,7 +21386,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "raja" @@ -20877,10 +21528,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20928,6 +21579,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "osoite" @@ -21158,10 +21809,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21209,4 +21860,33 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." + +#~ 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 " @@ -21216,7 +21896,4 @@ #~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla." -#~ msgid "Commit comment" -#~ msgstr "Lähetä kommentti" - #~ msgid "Server does not support changesets" #~ msgstr "Palvelin ei tue muutoskokoelmia" @@ -21225,4 +21902,13 @@ #~ 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 "Drawbridge" #~ msgstr "Laskusilta" @@ -21234,4 +21920,22 @@ #~ msgstr "Laskuristikko" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata " +#~ "automaattisesti." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja " +#~ "poistaa nykyisen paketin?\n" +#~ "\n" +#~ "{0}" + #~ msgid "Edit Drawbridge" #~ msgstr "Muokkaa laskusillan ominaisuuksia" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 15801) +++ /applications/editors/josm/i18n/po/fr.po (revision 15802) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-22 10:45+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-09 15:31+0000\n" "Last-Translator: nin2jardin \n" "Language-Team: Fr\n" @@ -14,8 +14,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -23,19 +23,17 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"La projection n'a pas pu être lue depuis les préférences. Utilisation de " -"EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +"La projection ne peut être lue dans les préférences. Mercartor sera utilisé." + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -43,10 +41,10 @@ "sur le serveur." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" @@ -54,43 +52,45 @@ "et continuer ?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Enregistrer et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Annuler et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -98,5 +98,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -105,10 +105,10 @@ msgstr "Annuler" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorant l’URL malformé : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -192,5 +192,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Greffons" @@ -257,15 +257,15 @@ msgstr "Longitude" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Placer les nœuds en cercle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -274,8 +274,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -296,9 +297,9 @@ msgstr "Outil : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Certains points sont (presque) sur la ligne" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Veuillez sélectionner au moins quatre nœuds." @@ -333,5 +334,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "le conflit" @@ -480,5 +481,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -489,7 +490,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Supprimer" @@ -499,14 +500,15 @@ msgstr "Supprimer les objets sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Écrire dessus" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Le fichier existe déjà. Écrire dessus ?" @@ -534,9 +536,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -574,16 +576,4 @@ msgstr "Quitter l’application." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Fichiers du serveur OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Fichiers GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Fichiers NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -657,12 +647,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -670,5 +660,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Erreur" @@ -689,5 +679,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -808,4 +798,18 @@ msgstr "Fusionner {0} nœuds" +#: ../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:70 +msgid "Mirror" +msgstr "Mirroir" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +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 +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 msgid "up" @@ -862,67 +866,25 @@ msgstr "sans-nom" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Ouvrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Ouvrir un fichier" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Erreur pendant le traitement {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Extension de fichier inconnue : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Marqueurs de {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Coordonnées importées : " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Phrases malformées : " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Erreurs de syntaxe : " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Phrases inconnues : " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Pas de coordonnées : " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Succès de l'import des trames NMEA" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Erreur lors de l'import des trames NMEA !" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1000,5 +962,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Coller" @@ -1028,5 +990,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Préférences" @@ -1072,14 +1034,19 @@ msgstr "Inverser les chemins" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Le fichier {0} existe. L'écraser ?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1089,26 +1056,26 @@ "Merci de signaler ceci comme une erreur." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Aucun document ouvert donc rien à sauvegarder." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Document vide" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Le document ne contient pas de données." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Sauvegarder tout de même" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflits" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1118,32 +1085,36 @@ "sauvegardés si vous ne les traitez pas. Continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Rejeter les conflits et sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Sauvegarder le fichier OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Sauvegarder le fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Sauvegarder le fichier OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Sauvegarder le calque" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Impossible de sauvegarder le fichier." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Extension de fichier inconnue." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Une erreur est survenue lors de la sauvegarde." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Une erreur est survenue lors de la restauration de la sauvegarde." @@ -1286,46 +1257,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:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dupliquer les nœuds utilisés par plusieurs chemins." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Un nœud taggué, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1333,10 +1304,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:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1350,9 +1321,9 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Nœud séparé" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1360,5 +1331,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1422,51 +1393,51 @@ "continuer ?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 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:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Charger ces changements ?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Envoyer les changements" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1673,14 +1644,14 @@ msgstr "Ajouter un nœud sur le chemin et le connecter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Créer un nouveau nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Sélectionner le nœud sous le curseur." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1689,14 +1660,14 @@ msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 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:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Continuer le chemin à partir du dernier nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Terminer le tracé." @@ -1716,5 +1687,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1728,5 +1699,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Relacher le bouton de souris pour arrêter la rotation." @@ -1764,5 +1735,5 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1771,5 +1742,5 @@ "fusionner avec le nœud le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1798,16 +1769,16 @@ "droit de la souris" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1815,55 +1786,67 @@ msgstr "Aucune donnée chargée" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1871,93 +1854,97 @@ "type: - type de l'objet (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +"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 "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +"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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1975,15 +1962,52 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Jeton inattendu : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Arguments manquants pour le OU" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Arguments manquants pour le -" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +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:595 +#, 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:602 +#, 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:33 @@ -2018,7 +2042,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Ajouter" @@ -2058,4 +2082,8 @@ msgstr "Mettre {0}={1} pour {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ChangeRelationMemberRole" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2063,65 +2091,10 @@ msgstr "Résoudre {0} conflits dans {1} objets" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Supprimer {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Supprimer {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Relation conflictuelle" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Supprimer de la relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Déplacer" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2133,171 +2106,19 @@ msgstr[1] "nœuds" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "RemoveRelationMember" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Pivoter" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Séquence" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Appliquer ?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Appliquer les changements sélectionnés" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Ne pas appliquer les changements" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Propriétés de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Rôles de la relation de référence" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Correction automatique d’étiquette" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, 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:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "différent" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "supprimé" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "vrai" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "faux" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "position" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Degrés décimaux" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Degrés Minutes Secondes" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "incomplet" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Erreur : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Attention : {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "voie" +msgstr[1] "voies" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2309,4 +2130,266 @@ msgstr[1] "relations" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, 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:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "impossible de résoudre un conflit non arbitré" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Supprimer {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Supprimer {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Relation conflictuelle" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, 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:118 +msgid "Move" +msgstr "Déplacer" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "Résoudre les conflits dans la liste des membres de la relation {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "RemoveRelationMember" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Pivoter" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Séquence" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, 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/VersionConflictResolveCommand.java:57 +#, 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:52 +#, 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/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Appliquer ?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "différent" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "supprimé" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "vrai" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "faux" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "position" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Degrés décimaux" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Degrés Minutes Secondes" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "incomplet" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Erreur : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Attention : {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2341,114 +2424,114 @@ msgstr[1] "{0} nœuds" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "La zone n'est pas fermée." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Le multipolygone \"{0}\" n'est pas fermé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Membre vide dans la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membre \"{0}\" supprimé de la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Chemin \"{0}\" comporte moins de deux points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Plus d'un chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Plus d'un chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Plus d'un \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Rôle inconnu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Type de membre inconnu pour \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Pas de chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Pas de chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Pas de noeud ou de chemin \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Le style de la restriction {0} n'a pas été trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-chemin \"{0}\" dans le multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." @@ -2456,25 +2539,16 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "non étiqueté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "texte" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "voie" -msgstr[1] "voies" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2496,5 +2570,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2581,4 +2655,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2593,4 +2668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2806,26 +2882,26 @@ msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Balises" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2834,21 +2910,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Bascule vers l'affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Basculer en mode plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2961,4 +3037,525 @@ msgstr "Initialisation" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "Le mien et le leur" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "Le mien et la fusion" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "Le leur et la fusion" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "Propriétés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Étiquettes" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "Nœuds" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Membres" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +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:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "Étiquettes ({0} conflits)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, 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:104 +msgid "Nodes(resolved)" +msgstr "Nœuds (résolus)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgid "" +"Merged node list frozen. No pending conflicts in the node list of this way" +msgstr "" +"La liste des nœuds fusionnés est verrouillée. Pas de conflit à résoudre dans " +"la liste de nœuds de ce chemin" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +msgid "Nodes(with conflicts)" +msgstr "Nœuds (avec conflits)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +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:113 +msgid "Members(resolved)" +msgstr "Membres (résolus)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +msgid "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" +msgstr "" +"La liste des membres fusionnés est verrouillée. Pas de conflit à résoudre " +"dans la liste des membres de cette relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +msgid "Members(with conflicts)" +msgstr "Membres (avec conflits)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +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:125 +msgid "No pending property conflicts" +msgstr "Pas de conflit de propriétés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "Propriétés (avec conflits)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +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:193 +msgid "Conflict Resolution" +msgstr "Résolution de conflits" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "paramètre en dehors de la plage : reçu {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "élément {0} non trouvé dans la liste" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "figer le défilement" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "Comparer " + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "Ma version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "Liste des éléments de mon jeu de données, i.e. les données locales" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "Version fusionnée" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" +"Liste des éléments fusionnés. Ils remplaceront mes éléments lorsque les " +"décisions de fusion seront appliquées." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "Leur version" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "Liste des éléments de leur jeu de données, i.e. les données du serveur" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "> haut" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "> bas" + +#: ../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 "" +"Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" +"Copier mes éléments sélectionnés avant le premier élément sélectionné de la " +"liste des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" +"Copier mes éléments sélectionnés après le premier élément sélectionné de la " +"liste des éléments fusionnés" + +#: ../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 "" +"Copier leurs éléments sélectionnés au début de la liste des éléments " +"fusionnés" + +#: ../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 "" +"Copier leurs éléments sélectionnés à la fin de la liste des éléments " +"fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" +"Copier leurs éléments sélectionnés avant le premier élément sélectionné de " +"la liste des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" +"Copier leurs éléments sélectionnés après le premier élément sélectionné de " +"la liste des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "Monter" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "Remonter les éléments sélectionnés d'un cran" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "Descendre" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "Descendre les éléments sélectionnés d'un cran" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Supprimer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "Figer" + +#: ../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 "Fige la liste courante des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +msgstr "Libérer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 +msgid "Unfreeze the list of merged elements and start merging" +msgstr "Libérer la liste courante des éléments fusionnés" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" +"Cliquer {0} pour commencer la fusion de leurs " +"éléments avec les miens" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" +"Clicquer {0} pour arrêter la fusion de leurs éléments " +"avec les miens" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "Ma version ({0} élément)" +msgstr[1] "Ma version ({0} éléments)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "Version fusionnée ({0} élément)" +msgstr[1] "Version fusionnée ({0} éléments)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "Leur version ({0} élément)" +msgstr[1] "Leur version ({0} éléments)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "le paramètre {0} ne peut pas être vide" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "variable {0} non encore enregistrée." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "variable {0} non encore enregistrée" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "Nœud" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la " +"commande de résolution" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "index de colonne inattendu. Reçu {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +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:83 +msgid "" +"Properties in the merged element. They will replace properties in my " +"elements when merge decisions are applied." +msgstr "" +"Propriétés des éléments fusionnés. Elles remplaceront les propriétés des " +"éléments lorsque les choix de fusion seront appliqués." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +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:102 +msgid "Coordinates:" +msgstr "Coordonnées :" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "Etat supprimé :" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "non supprimé" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "Conserver mes coordonnées" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "Conserver leurs coordonnées" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +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:380 +msgid "Keep my deleted state" +msgstr "Conserver mon état supprimé" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "Conserver leur état supprimé" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted state" +msgstr "Ne pas résoudre le conflit d'état" + +#. 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rôle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "Primitive" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"les nœuds fusionnés ne sont pas encore figés. Impossible de construire la " +"commande de résolution" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" +"Le jeu de données de la fusion n’incluera pas d’étiquette avec la clé {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "Mon jeu de données n’inclue pas d’étiquette avec la clé {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" +"impossible de fusionner un élément dont le conflit d’étiquette n’a pas été " +"résolu" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "Ma version (jeu de données local)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "Leur version (jeu de données du serveur)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr ">" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "Conserver la paire clé/valeur locale sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "Conserver la paire clé/valeur distante sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "Ne pas départager" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "Marquer les étiquettes sélectionnées comme restant à départager" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2972,5 +3569,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -3003,9 +3600,9 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Résoudre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -3013,25 +3610,73 @@ "liste ci-dessus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Fusionner les conflits." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "ATTENTION : valeur inattendue du paramètre conflict.resolution, reçu " + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Résoudre le conflit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflits : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "Résoudre les conflits" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +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:164 +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:165 +msgid "Apply Resolution" +msgstr "Appliquer la résolution" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "Appliquer la résolution partielle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "Continuer la résolution" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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 "" +"Vous n’avez pas fini de résoudre les conflits.
Cliquez {0} pour appliquer les conflits déjà résolus.
Vous pourrez résoudre " +"les conflits restants plus tard.
Cliquez {1} pour " +"retourner à la résolution de conflits." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Avertissement" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3196,10 +3841,4 @@ msgid "Member Of" msgstr "Membre de" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rôle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3386,8 +4025,4 @@ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Membres" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3421,11 +4056,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Supprimer" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3480,5 +4108,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3503,5 +4131,5 @@ msgstr "oui" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3528,24 +4156,24 @@ msgstr "non" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Membres : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editeur de relation : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Il y a eu des conflits pendant l’importation." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Erreur d'analyse de la réponse du serveur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Impossible de se connecter au serveur." @@ -3807,10 +4435,4 @@ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Avertissement" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3849,5 +4471,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3885,53 +4507,53 @@ msgstr "La date indiquée ne peut être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "point GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Personnaliser le dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Utiliser les réglages généraux." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Sélectionner les options de dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Personnaliser la couleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3939,6 +4561,6 @@ msgstr "Par défaut" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3946,31 +4568,31 @@ msgstr "Choisir une couleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Marqueurs depuis des points nommés" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Points de parcours nommés depuis {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importer Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Fichiers audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Marqueurs audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importer des images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3979,5 +4601,5 @@ msgstr[1] "{0} traces, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3986,5 +4608,5 @@ msgstr[1] "{0} chemins, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3993,28 +4615,28 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nom : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Description : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Intervalle de temps : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Longueur : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Convertir en calque de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -4026,11 +4648,11 @@ "regardez ici :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4040,29 +4662,29 @@ msgstr "Converti depuis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Tout télécharger dans un rayon de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} mètres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Aire maximale par requête:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4073,5 +4695,5 @@ "Voulez-vous
continuer ?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -4079,5 +4701,5 @@ "audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4087,5 +4709,5 @@ "chemin ont été omis ou déplacés au début." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4104,24 +4726,24 @@ msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4157,5 +4779,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4164,5 +4786,5 @@ msgstr[1] "une trace avec {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4171,5 +4793,5 @@ msgstr[1] "{0} est constitué de {1} traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4314,5 +4936,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Veuillez sélectionnez la rangée à supprimer." @@ -5695,5 +6317,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Actualiser" @@ -5705,7 +6327,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Ajouter soit site-josm.xml soit des pages Wiki." +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:89 @@ -5713,4 +6334,8 @@ msgid "Please select an entry." msgstr "Veuillez sélectionner une entrée." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +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:106 @@ -6099,5 +6724,5 @@ msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6108,15 +6733,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6126,18 +6751,18 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Changer les propriétés" @@ -6177,4 +6802,16 @@ msgstr "Préparation des données..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Fichiers GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Marqueurs de {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" @@ -6182,4 +6819,37 @@ "Erreur d'analyse syntaxique : la structure du document n’est pas valide pour " "un document gpx" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Fichiers NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Coordonnées importées : " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Phrases malformées : " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Erreurs de syntaxe : " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Phrases inconnues : " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Pas de coordonnées : " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Succès de l'import des trames NMEA" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Erreur lors de l'import des trames NMEA !" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6241,4 +6911,13 @@ msgstr "Hôte inconnu" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "Fichiers compressés bzip2 du serveur OSM" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "Fichier bz2 invalide." + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6266,8 +6945,16 @@ msgstr "Interruption en cours..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "Fichiers compressés gzip du serveur 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 +msgid "OSM Server Files" +msgstr "Fichiers du serveur OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6298,5 +6985,5 @@ #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" +msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 @@ -6304,14 +6991,18 @@ msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" +"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, " +"valeur {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" +msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Membre \"{0}\" supprimé de la relation." +msgstr "" +"Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, " +"valeur {2}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6328,9 +7019,11 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" +"Donnée invalide pour l'attribut \"version\" sur la primitive OSM d'id {0}, " +"valeur {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 @@ -6357,5 +7050,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6363,4 +7056,7 @@ "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/io/OsmServerReader.java:85 @@ -6379,15 +7075,20 @@ "charger, et/ou attendez un peu avant de recommencer." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Mise à jour des greffons" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Télécharger les greffons" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6400,23 +7101,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Impossible de télécharger le greffon : {0} de {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "{0} greffon téléchargé avec succès. Veuillez redémarrer JOSM." +msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "Téléchargement du greffon {0}..." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Le greffon {0} semble endommagé ou n'a pas pu être téléchargé " -"automatiquement." +msgid "Skip download" +msgstr "Annuler le téléchargement" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, 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:119 +msgid "Download Plugin" +msgstr "Télécharger le greffon" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "Annuler le téléchargement" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6434,25 +7144,25 @@ "nécessaire." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, 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 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Greffon non trouvé : {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6463,21 +7173,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Désactiver le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Garder le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6487,5 +7197,5 @@ "l’autorisation de remplacer les greffons existants." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6494,10 +7204,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6506,9 +7216,9 @@ "d'extension avant de rapporter un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Ce module d'extension doit-il être désactivé ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6518,5 +7228,5 @@ "greffon ne soit plus chargé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6526,19 +7236,19 @@ "obtenu JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "Aucune description disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Plus de détails" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6547,13 +7257,13 @@ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Pas d'information sur les greffons trouvée." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Tous les greffons installés sont à jour." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6566,9 +7276,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Télécharger les greffons manquants" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6581,10 +7291,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Télécharger les greffons" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6607,41 +7313,14 @@ msgstr "inconnu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Greffon intégré à JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Le greffon est déjà installé" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger la " -"version actuelle en supprimant l'archive existante?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Supprimer et télécharger" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Impossible de supprimer le fichier du greffon : {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6797,9 +7476,4 @@ msgstr "Veuillez saisir une description de votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Étiquettes" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6971,4 +7645,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Erreur pendant le traitement {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7207,6 +7886,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -7554,37 +8233,42 @@ "Sélectionnez en une dans la liste, puis réessayez" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Calque vide" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "N'est pas vectorisée." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Centre de la trame : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Est vectorisée." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Zone de délimitation de la commune : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "Sauvegarder la couche WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7593,6 +8277,11 @@ msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "Charger la couche WMS" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7601,10 +8290,10 @@ "attendue" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7615,9 +8304,9 @@ "Veuillez en créer un nouveau." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Erreur de format du tampon" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7625,5 +8314,5 @@ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Erreur de tampon de zone Lambert" @@ -7664,11 +8353,10 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Couper un chemin" +msgstr "Diviser zone" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Divise une zone à l’aide d'un chemin sans étiquette." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -7678,4 +8366,7 @@ "Remove the area from the relation before splitting it." msgstr "" +"La zone sélectionnée ne peut être divisée, car elle est membre d’une " +"relation.\n" +"Veuillez supprimer la zone de la relation avant de la diviser." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8101,7 +8792,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "eau" @@ -8505,16 +9196,21 @@ msgstr "Etat du problème inconnu" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Open Visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Extension de fichier inconnue : {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8609,5 +9305,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8634,25 +9330,25 @@ msgstr "Ouvrir une liste des nœuds de routage" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Ajoute un calque de routage" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Critère" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Le plus court" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Le plus rapide" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Inverser l'itinéraire" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Suprimer l'itinéraire" @@ -8826,11 +9522,11 @@ msgstr "fin" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Modifier les étiquettes" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Lance la fenêtre de l'éditeur d'étiquette" @@ -8840,8 +9536,4 @@ msgstr "Greffon d'édition des étiquettes JOSM" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(aucun)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8852,5 +9544,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8859,5 +9551,5 @@ msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8879,8 +9571,14 @@ msgstr "Filtrez" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Effacer" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "numéro de colonne {0} inattendu" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9813,7 +10511,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "bâtiment" @@ -9827,5 +10525,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "zone" @@ -9922,4 +10620,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "Sélectionner le nœud de départ à la fin d'un chemin" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "Intersection atteinte" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -10021,19 +10735,19 @@ "Cela peut amener à de mauvaises coordonnées." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10042,17 +10756,17 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Canal alpha" @@ -10066,52 +10780,52 @@ msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Préférences du greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nom du menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Nom du menu (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "URL de WMS (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 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:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Copier défaut" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Veuillez sélectionner la colonne à copier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Tuiles se chevauchant" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% de lat. :" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% de lon. :" @@ -10194,4 +10908,5 @@ "Creating and handling address nodes and buildings within Czech Republic." msgstr "" +"Crée et gère les adresses des nœuds et bâtiments en République Tchèque." #. Plugin DirectUpload @@ -10212,12 +10927,9 @@ #: build/trans_plugins.java:17 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 principale fonction du greffon est de permettre la suppression de points " -"de la trace GPX. Ce greffon peut être utilisé pour préparer des traces à " -"être chargées vers OSM, par ex. en supprimant des parties inintéressantes " -"des traces." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" +"Permet à un utilisateur de rendre anonyme l'horodatage et de supprimer des " +"parties d'une trace GPX très rapidement." #. Plugin globalsat @@ -10401,6 +11113,11 @@ "intégré pour le champ ’description’." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +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:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11220,5 +11937,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privé" @@ -11266,5 +11983,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "destination" @@ -11301,5 +12018,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permis par le propriétaire" @@ -11531,6 +12248,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "motorway" @@ -11556,6 +12273,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "voie rapide" @@ -11581,6 +12298,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "primary" @@ -11606,6 +12323,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "secondary" @@ -11619,5 +12336,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "tertiary" @@ -11635,5 +12352,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "residential" @@ -11651,5 +12368,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "service" @@ -11676,6 +12393,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "construction" @@ -11725,5 +12442,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "roundabout" @@ -12702,5 +13419,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "marais" @@ -14424,27 +15141,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -17282,8 +17999,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "vélo/bicyclette" @@ -17344,6 +18061,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17354,8 +18069,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "piéton" @@ -17381,5 +18096,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "métro" @@ -17464,4 +18179,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17476,8 +18192,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17497,5 +18215,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17585,7 +18303,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "pont" @@ -17849,15 +18567,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "déprécié" @@ -17899,5 +18617,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "cheval" @@ -18107,11 +18825,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "barrière" @@ -18149,6 +18867,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "rue" @@ -18204,7 +18922,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "piste" @@ -18260,8 +18978,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "voie ferrée" @@ -18282,5 +19000,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "services" @@ -18294,5 +19012,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "Ford" @@ -18313,5 +19031,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "zone de manœuvre" @@ -18326,5 +19044,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "Accès d'urgence" @@ -18339,5 +19057,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "berge" @@ -18351,5 +19069,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "ruisseau" @@ -18363,5 +19081,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "dock" @@ -18389,5 +19107,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "aqueduc" @@ -18555,13 +19273,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "artificiel" @@ -18623,7 +19341,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "point ferroviaire" @@ -18646,10 +19364,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "Autre voie ferrée" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "passage au dessus d'une voie ferrée" @@ -18679,6 +19397,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "ligne ferroviaire touristique" @@ -18723,6 +19441,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "piste d'atterrissage" @@ -18736,5 +19454,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18756,5 +19474,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "piste (sombre)" @@ -18768,5 +19486,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "piste (claire)" @@ -18814,7 +19532,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "couloir aérien" @@ -18831,5 +19549,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "piste bleue" @@ -18844,5 +19562,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "piste rouge" @@ -18857,5 +19575,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "piste noire" @@ -18870,5 +19588,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "piste_orange" @@ -18883,5 +19601,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "hors piste" @@ -18896,5 +19614,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "piste verte" @@ -18999,10 +19717,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "alimentation électrique" @@ -19015,8 +19733,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "appontement/jetée" @@ -19030,5 +19746,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "oléoduc" @@ -19156,12 +19872,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "loisir" @@ -19175,5 +19891,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "marina" @@ -19245,8 +19961,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "aménité" @@ -19348,10 +20064,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "équipement de traffic" @@ -19737,22 +20453,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "équipement lumineux" @@ -19784,6 +20500,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "eau (claire)" @@ -19844,8 +20560,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "santé" @@ -20198,26 +20914,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "magasin" @@ -20289,8 +21005,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hôtel" @@ -20440,9 +21156,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "tourisme" @@ -20514,8 +21230,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "patrimoine" @@ -20586,8 +21302,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "espace vert" @@ -20601,5 +21317,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "carrière" @@ -20613,5 +21329,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "décharge" @@ -20633,5 +21349,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "bassin" @@ -20645,5 +21361,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "forêt" @@ -20657,5 +21373,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "bâtiments de ferme" @@ -20678,5 +21394,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "commerce de proximité" @@ -20690,5 +21406,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "zone industrielle" @@ -20702,5 +21418,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "terrain en friche" @@ -20714,5 +21430,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "espace vert" @@ -20726,5 +21442,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "zone ferroviaire" @@ -20781,7 +21497,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "zone militaire" @@ -20795,5 +21511,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cimetière" @@ -20806,5 +21522,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "sommet" @@ -20819,5 +21535,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "glacier" @@ -20831,5 +21547,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "volcan" @@ -20884,8 +21600,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "nature" @@ -20899,5 +21615,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "broussailles" @@ -20911,5 +21627,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "lande/bruyère" @@ -20923,5 +21639,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "bois" @@ -20935,5 +21651,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "terrain boueux/vase" @@ -20947,5 +21663,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "plage" @@ -21023,8 +21739,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "route" @@ -21072,7 +21788,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "frontière" @@ -21214,10 +21930,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "lieu" @@ -21265,6 +21981,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adresse" @@ -21495,10 +22211,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Carte Open Aerial" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21546,4 +22262,32 @@ msgstr "Rues Geofabrik.de de Rhénanie-du-Nord-Westphalie" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +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 "Terraserver Urbain" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." + +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21553,10 +22297,4 @@ #~ "bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" -#~ msgid "Commit comment" -#~ msgstr "Commentaire sur cette déposition" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - #~ msgid "Charge" #~ msgstr "Charge" @@ -21568,4 +22306,13 @@ #~ 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 "Drawbridge" #~ msgstr "Pont-levis" @@ -21577,4 +22324,22 @@ #~ msgstr "Herse" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Le greffon {0} semble endommagé ou n'a pas pu être téléchargé " +#~ "automatiquement." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger " +#~ "la version actuelle en supprimant l'archive existante?\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "viaduc" @@ -21583,4 +22348,7 @@ #~ msgstr "Magasin de sport" +#~ msgid "Delete and Download" +#~ msgstr "Supprimer et télécharger" + #~ msgid "Edit Drawbridge" #~ msgstr "Modifier un pont-levis" @@ -21589,4 +22357,14 @@ #~ msgstr "Modifier une herse" +#~ 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 principale fonction du greffon est de permettre la suppression de " +#~ "points de la trace GPX. Ce greffon peut être utilisé pour préparer des " +#~ "traces à être chargées vers OSM, par ex. en supprimant des parties " +#~ "inintéressantes des traces." + #~ msgid "Remove route nodes" #~ msgstr "Supprimer les nœuds du chemin" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 15801) +++ /applications/editors/josm/i18n/po/gl.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:29+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:11+0000\n" "Last-Translator: Rafael Ávila Coya \n" "Language-Team: Galician \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"A proxección non puido ser lida dende as preferencias. Usando EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Cambios non gardados" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Gardar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Descartar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +102,10 @@ msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Engadidos" @@ -254,15 +254,15 @@ msgstr "Lonxitude" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Alinear os nodos en círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +294,9 @@ msgstr "Ferramenta: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Algúns dos nodos están (case) na liña" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Por favor, selecciona polo menos catro nodos." @@ -330,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflicto" @@ -474,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -483,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Borrar" @@ -493,14 +494,15 @@ msgstr "Borrar obxectos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "O ficheiro existe. Sobrescribir?" @@ -529,9 +531,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -569,16 +571,4 @@ msgstr "Sair da aplicación," -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Ficheiros de Servidor OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Ficheiros GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Ficheiros NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -652,12 +642,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -665,5 +655,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Erro" @@ -684,5 +674,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -797,4 +787,18 @@ msgstr "Acoplar {0} nodos" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -851,67 +855,25 @@ msgstr "sen nome" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Abrir un ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Erro durante a análise {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Extensión de ficheiro descoñecida: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Marcas de {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Coordenadas importadas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Sentencias mal formadas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Erros de suma de verificación: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Sentencias descoñecidas: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Coordenada cero: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Importación NMEA satisfactoria" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Fallo de importación NMEA!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -986,5 +948,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Pegar" @@ -1015,5 +977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Preferencias" @@ -1059,14 +1021,19 @@ msgstr "Invertir vías" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Gardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Gardar os datos actuais." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1076,26 +1043,26 @@ "favor, informa disto como un erro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Documento valeiro" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "O documento non contén datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Gardar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflictos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1105,32 +1072,36 @@ "tratados como se os rexeitases todos. Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Rexeitar Conflictos e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Gardar ficheiro OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Gardar ficheiro GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Gardar ficheiro OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Non se puido facer copia de seguridade do ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Extensión de ficheiro descoñecida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Ocurriu un erro mentres se gardaba." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "" @@ -1270,55 +1241,55 @@ msgstr "Cambia a configuración global \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Despegar Vías" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicar nodos que son usados por múltiples vías." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Seleccionar ou ben:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha " +"vía, ou" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha " -"vía, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1326,5 +1297,5 @@ "vía." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1337,9 +1308,9 @@ "obterán as súas propias copias e todos os nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Despegar Nodo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1347,5 +1318,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1408,50 +1379,50 @@ "continuar?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "SIbir todos os cambios ó servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Obxectos para engadir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Obxectos para modificar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Obxectos para borrar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Subir estes cambios?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Subir Cambios" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Hai conflictos sen resolver. Debes resolver estes antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Non hai cambios que subir." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1657,14 +1628,14 @@ msgstr "Engadir nodo a vía e conectar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Crear novo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Seleccionar nodo baixo o cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1673,14 +1644,14 @@ msgstr[1] "Insertar novo nodo en {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 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:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Continuar vía a partir do último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Rematar debuxo." @@ -1700,5 +1671,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 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." @@ -1710,5 +1681,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Soltar o botón do rato para deter a rotación." @@ -1745,5 +1716,5 @@ msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1752,5 +1723,5 @@ "próximo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1777,16 +1748,16 @@ "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1794,145 +1765,155 @@ msgstr "Non se cargaron datos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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 - que non conteña 'Bak' no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "foot: - key=foot set to any value." msgstr "foot: - clave=foot establecida a calquer valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 +#: ../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:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1950,15 +1931,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Faltan argumentos para OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Faltan argumentos para NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1993,7 +2004,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Engadir" @@ -2033,4 +2044,8 @@ msgstr "Establecer {0}={1} para {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2038,65 +2053,10 @@ msgstr "Solucionar {0} conflictos en {1} obxectos" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Relación contradictoria" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Borrar da relación" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Mover" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2108,171 +2068,18 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Xirar" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Secuencia" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Aplicar?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Aplicar os cambios seleccionados" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Non aplicar cambios" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Propiedades de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Papeis nas relacións que fan referencia a" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Corrección" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, 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:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "diferente" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "borrado" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "verdadeiro" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falso" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "posición" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Grados Decimais" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grados Minutos Segundos" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "incompleto" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Erro: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Advertencia: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "vía" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2284,4 +2091,266 @@ msgstr[1] "relacións" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Borrar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Relación contradictoria" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Mover" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Xirar" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Secuencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Aplicar?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "diferente" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "borrado" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "verdadeiro" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falso" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "posición" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Grados Decimais" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grados Minutos Segundos" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Erro: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Advertencia: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2316,137 +2385,129 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "A vía de estilo de área non está pechada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "a vía multipoligonal \"{0}\" non está pechada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Membro vacío na relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membro \"{0}\" borrado na relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vía \"{0}\" con menos de dous puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Atopadas máis de unha vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Atopadas máis de unha vía \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Papel \"{0}\" descoñecido." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de membro descoñecido para \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Non se atoparon vias \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Non se atoparon vías \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Non se atopou o estilo para a restrición {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre as vías ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "A vía interior ''{0}'' está fóra." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "Sen etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "texto" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "vía" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2468,5 +2529,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2537,4 +2598,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2549,4 +2611,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2758,26 +2821,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2786,21 +2849,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Vista de malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Cambiar Vista de Malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Cambiar a vista de pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2913,4 +2976,493 @@ msgstr "Inicializando" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Etiquetas" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Membros" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Eliminar" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Papel" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2924,5 +3476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2953,9 +3505,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2963,25 +3515,69 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Combinando conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Resolver Conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Solucionar Conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflictos: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3145,10 +3741,4 @@ msgid "Member Of" msgstr "Membro de" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Papel" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3335,8 +3925,4 @@ msgstr "Etiquetas (un valor vacío borra a etiqueta)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Membros" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3370,11 +3956,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Eliminar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3429,5 +4008,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3452,5 +4031,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3477,24 +4056,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Membros: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editor de Relación: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Houbo conflictos durante a importación." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Erro analizando a resposta do servidor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Non se pode conectar co servidor." @@ -3753,10 +4332,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3795,5 +4368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3831,53 +4404,53 @@ msgstr "A hora introducida non puido ser analizada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "punto gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Personalizar debuxo de liñas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Usar configuración global." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Non debuxar liñas entre puntos para esta capa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Seleccionar as opcións de liña do debuxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Personalizar Cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3885,6 +4458,6 @@ msgstr "Predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3892,31 +4465,31 @@ msgstr "Escolle unha cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importar Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Ficheiros Wave Audio (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Marcas de audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importar imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3925,5 +4498,5 @@ msgstr[1] "{0} trazados, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3932,5 +4505,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3939,28 +4512,28 @@ msgstr[1] "{0} puntos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Descrición: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Rango de tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Lonxitude: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3971,11 +4544,11 @@ "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3985,29 +4558,29 @@ msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4018,9 +4591,9 @@ "Desexas
continuar?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4028,5 +4601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4045,24 +4618,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4098,5 +4671,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4105,5 +4678,5 @@ msgstr[1] "un trazado con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4112,5 +4685,5 @@ msgstr[1] "{0} componse de {1} trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4245,5 +4818,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Por favor seleccione a fila a borrar." @@ -5613,5 +6186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Actualizar" @@ -5623,7 +6196,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Engadir ou site-josm.xml ou as páxinas Wiki." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5631,4 +6203,8 @@ msgid "Please select an entry." msgstr "Por favor selecciona unha entrada." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6020,5 +6596,5 @@ msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6029,15 +6605,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6047,18 +6623,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -6096,7 +6672,52 @@ msgstr "Preparando datos..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Ficheiros GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Marcas de {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Erro de análise: estrutura de documento non válida para documento gpx" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Ficheiros NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Coordenadas importadas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Sentencias mal formadas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +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 +msgid "Unknown sentences: " +msgstr "Sentencias descoñecidas: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Coordenada cero: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Importación NMEA satisfactoria" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Fallo de importación NMEA!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6157,4 +6778,13 @@ msgstr "Maquina descoñecida" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6182,8 +6812,16 @@ msgstr "Abortando..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "Ficheiros de Servidor OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6227,7 +6865,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Membro \"{0}\" borrado na relación." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6273,5 +6911,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6295,15 +6933,20 @@ "logo de esperar un tempo." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Actualizar Engadidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Descargar Engadidos" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6316,23 +6959,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM." -msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Non se puido descargar o engadido: {0} de {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"O engadido {0} semella estar estropeado ou non puido ser descargado " -"automáticamente." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6350,25 +7002,25 @@ "non é necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "O engadido require a actualización de JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Engadido non atopado: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6379,21 +7031,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Desactivar engadido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6403,5 +7055,5 @@ "permisos para sobrescribir os existentes." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6410,10 +7062,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6422,9 +7074,9 @@ "dun fallo." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Debería ser desactivado o engadido?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6432,5 +7084,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6440,19 +7092,19 @@ "que che propocionou JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "sen descripción dispoñible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6461,13 +7113,13 @@ msgstr[1] "Descargada información de engadidos de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Non se atopou información de engadidos." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Todos os engadidos instalados estan actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6480,9 +7132,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Descargar engadidos perdidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6495,10 +7147,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Descargar Engadidos" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6521,41 +7169,14 @@ msgstr "descoñecido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Engadido empaquetado con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "O engadido xa existe" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"O arquivo de engadidos xa esta dispoñible. Queres descargargar a versión " -"actual borrando o arquivo existente?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Borrar e Descargar" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Erro borrando ficheiro de engadido: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6697,9 +7318,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Etiquetas" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6871,4 +7487,9 @@ 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 +#, 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 @@ -7090,6 +7711,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Erro cargando ficheiro" @@ -7408,37 +8029,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7447,16 +8073,21 @@ msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7467,14 +8098,14 @@ "Crear unha nova." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7515,7 +8146,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Separar Vía" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7946,7 +8576,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "" @@ -8322,16 +8952,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Extensión de ficheiro descoñecida: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8418,5 +9053,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8443,25 +9078,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8634,11 +9269,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8648,8 +9283,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8660,5 +9291,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8667,5 +9298,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8687,7 +9318,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9578,7 +10215,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "" @@ -9592,5 +10229,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9680,4 +10317,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9754,36 +10407,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9797,51 +10450,51 @@ msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Nome de Menú (Predeterminado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "URL WMS (Predeterminada)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Copiar Predeterminado" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9927,7 +10580,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10077,6 +10729,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10894,5 +11551,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10940,5 +11597,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10975,5 +11632,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11205,6 +11862,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11230,6 +11887,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11255,6 +11912,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "" @@ -11280,6 +11937,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "" @@ -11293,5 +11950,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11309,5 +11966,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "" @@ -11325,5 +11982,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11350,6 +12007,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11399,5 +12056,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "" @@ -12376,5 +13033,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -14098,27 +14755,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "" @@ -16956,8 +17613,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "" @@ -17018,6 +17675,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17028,8 +17683,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -17055,5 +17710,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "" @@ -17138,4 +17793,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17150,8 +17806,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17171,5 +17829,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17259,7 +17917,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "" @@ -17523,15 +18181,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17573,5 +18231,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17781,11 +18439,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17823,6 +18481,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "" @@ -17878,7 +18536,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17934,8 +18592,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17956,5 +18614,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17968,5 +18626,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17987,5 +18645,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -18000,5 +18658,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18013,5 +18671,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "" @@ -18025,5 +18683,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "" @@ -18037,5 +18695,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -18063,5 +18721,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18229,13 +18887,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18297,7 +18955,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18320,10 +18978,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18353,6 +19011,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18397,6 +19055,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18410,5 +19068,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18430,5 +19088,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18442,5 +19100,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18488,7 +19146,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18505,5 +19163,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18518,5 +19176,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18531,5 +19189,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18544,5 +19202,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18557,5 +19215,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18570,5 +19228,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18673,10 +19331,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18689,8 +19347,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "" @@ -18704,5 +19360,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "" @@ -18830,12 +19486,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18849,5 +19505,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18919,8 +19575,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -19022,10 +19678,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19411,22 +20067,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19458,6 +20114,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19518,8 +20174,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19872,26 +20528,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "" @@ -19963,8 +20619,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "" @@ -20114,9 +20770,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "" @@ -20188,8 +20844,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "" @@ -20260,8 +20916,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20275,5 +20931,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "" @@ -20287,5 +20943,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20307,5 +20963,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20319,5 +20975,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "" @@ -20331,5 +20987,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20352,5 +21008,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20364,5 +21020,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "" @@ -20376,5 +21032,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20388,5 +21044,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20400,5 +21056,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20455,7 +21111,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "" @@ -20469,5 +21125,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "" @@ -20480,5 +21136,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "" @@ -20493,5 +21149,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "" @@ -20505,5 +21161,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "" @@ -20558,8 +21214,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20573,5 +21229,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20585,5 +21241,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20597,5 +21253,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "" @@ -20609,5 +21265,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "" @@ -20621,5 +21277,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "" @@ -20697,8 +21353,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20746,7 +21402,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "" @@ -20888,10 +21544,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20939,6 +21595,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "" @@ -21169,10 +21825,10 @@ msgstr "" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21220,4 +21876,26 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki." + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ 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 " @@ -21226,2 +21904,32 @@ #~ "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 "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 "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "O engadido {0} semella estar estropeado ou non puido ser descargado " +#~ "automáticamente." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "O arquivo de engadidos xa esta dispoñible. Queres descargargar a versión " +#~ "actual borrando o arquivo existente?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Delete and Download" +#~ msgstr "Borrar e Descargar" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 15801) +++ /applications/editors/josm/i18n/po/he.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:16+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:56+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Hebrew \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,67 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:259 +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:347 +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "רמז: כמה מהשינויים הגיעו מהעלאת נתונים חדשים לשרת." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "שינויים לא שמורים" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "שמור וצא" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "התעלם משינויים וצא" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -93,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -100,10 +102,10 @@ msgstr "ביטול" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -187,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "תוספים" @@ -252,15 +254,15 @@ msgstr "קו אורך" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "סדר את הצמתים בעיגול" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "העבר את הצמתים הנבחרים לעיגול." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -269,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -291,9 +294,9 @@ msgstr "כלי: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "כמה מהנקונות הן (כמעט) באותו קו" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "נא בחר לפחות ארבעה צמתים." @@ -328,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "התנגשות" @@ -466,5 +469,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -475,7 +478,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "מחק" @@ -485,14 +488,15 @@ msgstr "מחק את הפריטים הנבחרים." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "שכתוב" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "הקובץ כבר קיים. לשכתב?" @@ -520,9 +524,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -560,16 +564,4 @@ msgstr "צא מהיישום." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "קבצי שרת OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "קבצי GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "קבצי NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -641,12 +633,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -654,5 +646,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "שגיאה" @@ -673,5 +665,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -783,4 +775,18 @@ msgstr "מזג {0} צמתים" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -837,67 +843,25 @@ msgstr "ללא שם" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "פתח..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "פתח קובץ." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "שגיאה בעת ניתוח {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "סיומת קובץ לא מוכרת: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "סמנים מהמיקום {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "משפטים לא תקינים: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "שגיאות Checksum: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "משפטים לא ידועים: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "יבוא NMEA הסתיים בהצלחה" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "יבוא NMEA נכשל!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -968,5 +932,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "הדבק" @@ -995,5 +959,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "העדפות" @@ -1039,14 +1003,19 @@ msgstr "הפוך דרכים" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "שמירה" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "שמור את הנתונים הנוכחיים." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1055,26 +1024,26 @@ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "מסמך ריק" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "המסמך לא מכיל נתונים" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "שמור בכל זאת" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "התנגשויות" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1084,32 +1053,36 @@ "להמשיך?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "דחה התנגשויות ושמור" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "שמור קובץ OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "שמור קובץ GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "שמור קובץ OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "לא יכול לגבות קובץ." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "סיומת הקובץ אינה ידועה." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "אירעה שגיאה במהלך שמירה" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי." @@ -1239,56 +1212,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "הפרד דרכים" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "שכפל נקודות המשותפות למספר דרכים." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "הנקודה לא מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "בחר:" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 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:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1298,9 +1271,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1308,5 +1281,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1364,50 +1337,50 @@ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "העלה ל-OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "העלה את כל השינויים לשרת ה-OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "פריטים להוספה:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "פריטים לשינוי:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "פריטים למחיקה:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "העלה את השינויים האלה?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "העלה שינויים" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1613,14 +1586,14 @@ msgstr "הוסף צומת לדרך וחבר" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 +msgid "Select node under cursor." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 #, java-format msgid "Insert new node into way." @@ -1629,14 +1602,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "" @@ -1656,5 +1629,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע." @@ -1665,5 +1638,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "שחרר את סמן העכבר להפסקת ההטייה" @@ -1700,5 +1673,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1706,5 +1679,5 @@ "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1727,16 +1700,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1744,145 +1717,155 @@ msgstr "שום נתונים לא נטענו." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "החלפת הבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "הוספה לבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "הסר מהבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "רגיש להבדל בין אותיות גדולות וקטנות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "ביטוי רגולרי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "מטרות מיוחדות:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1899,15 +1882,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "חסרים ארגומנטים ל-or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "חסרים ארגומנטים ל-not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." msgstr "ציפיתי לסוגר סוגריים." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1942,7 +1955,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "הוסף" @@ -1982,4 +1995,8 @@ msgstr "קבע {0}={1} עבור {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -1987,60 +2004,10 @@ msgstr "פתור {0} התנגשויות ב{1} עצמים" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "מחק {1}{0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "מחק {0}{1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "מחק מיחס" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -msgid "Split way segment" -msgstr "פצל קטע דרך" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "הזז" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2052,167 +2019,19 @@ msgstr[1] "צמתים" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "סובב" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "רצף" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "החל?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "החל את השינויים שנבחרו" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "אל תחל את השינויים" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "מאפיינים של ‏ " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "תיקון תוויות אוטומטי" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "קובץ תצורה לא תקין בשורות {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "שונה" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "מחוק" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "אמת" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "שקר" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "מיקום" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "מעלות עשרוניות" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "מעלות דקות שניות" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "דרום" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "צפון" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "מערב" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "מזרח" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "לא גמור" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "שגיאה: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "אזהרה: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "דרך" +msgstr[1] "דרכים" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2224,4 +2043,257 @@ msgstr[1] "יחסים" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "מחק {1}{0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "מחק {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "מחק מיחס" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +msgid "Split way segment" +msgstr "פצל קטע דרך" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "הזז" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "סובב" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "רצף" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "החל?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "שונה" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "מחוק" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "אמת" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "שקר" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "מיקום" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "מעלות עשרוניות" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "מעלות דקות שניות" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "דרום" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "צפון" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "מערב" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "מזרח" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "לא גמור" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "שגיאה: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "אזהרה: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2256,138 +2328,129 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "איבר ריק ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "מחק איבר \"{0}\" ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "הדרך \"{0}\" בת פחות משתי נקודות." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "טקסט" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "דרך" -msgstr[1] "דרכים" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2409,5 +2472,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2478,4 +2541,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2490,4 +2554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2696,26 +2761,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2724,21 +2789,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "מסך מלא" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "שמע" @@ -2848,4 +2913,493 @@ msgstr "מאתחל" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "תוויות" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "חברים" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "הסר" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "תפקיד" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2859,5 +3413,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2888,33 +3442,77 @@ msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "פתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "התנגשויות מתמזגות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "התנגשויות: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "אזהרה" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3074,10 +3672,4 @@ msgid "Member Of" msgstr "חבר ב" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "תפקיד" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3261,8 +3853,4 @@ msgstr "תוויות (ערך ריק מוחק את התווית)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "חברים" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3296,11 +3884,4 @@ msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "הסר" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3355,5 +3936,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3378,5 +3959,5 @@ msgstr "כן" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3403,24 +3984,24 @@ msgstr "לא" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "חברים: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "ארעו התנגשויות במהלך הייבוא." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "שגיאה בניתוח תשובת השרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "לא יכול להתחבר לשרת" @@ -3674,10 +4255,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "אזהרה" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3716,5 +4291,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3752,53 +4327,53 @@ msgstr "לא ניתן לנתח את הזמן שהוזן." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "נקודת gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "התאם ציור קו" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "צייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "אל תצייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "בחר אפשרויות ציור קו" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "התאם צבעים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "אישור" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3806,6 +4381,6 @@ msgstr "ברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3813,31 +4388,31 @@ msgstr "בחר צבע" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "סמנים מנקודות בעלות שם" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "ייבא שמע" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "קובץ שמע (wav.*)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "סמן שמע מ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "ייבא תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3846,5 +4421,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3853,5 +4428,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3860,28 +4435,28 @@ msgstr[1] "{0} נקודות דרך" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "שם: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "תיאור: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "אורך: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "המר לשכבת נתונים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3892,11 +4467,11 @@ "מסלולים, ראה כאן:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3906,29 +4481,29 @@ msgstr "המר מ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "הורד הכל עם:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} מטרים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} קמ\"ר" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3939,9 +4514,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3949,5 +4524,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3966,24 +4541,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} נמחק/ו.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4019,5 +4594,5 @@ msgstr[1] "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4026,5 +4601,5 @@ msgstr[1] "מסלול בעל {0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4033,5 +4608,5 @@ msgstr[1] "{0} מורכב מ-{1} מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4164,5 +4739,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "נא בחר את השורה למחיקה." @@ -5496,5 +6071,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "עדכן" @@ -5506,6 +6081,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5514,4 +6088,8 @@ msgid "Please select an entry." msgstr "בחר כניסה." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5871,5 +6449,5 @@ msgstr "סוג לא ידוע: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5880,15 +6458,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5898,18 +6476,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "שנה תכונות" @@ -5947,8 +6525,53 @@ msgstr "מכין נתונים..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "קבצי GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "סמנים מהמיקום {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין." +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "קבצי NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "משפטים לא תקינים: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "שגיאות Checksum: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "משפטים לא ידועים: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "יבוא NMEA הסתיים בהצלחה" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "יבוא NMEA נכשל!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6005,4 +6628,13 @@ msgid "Unknown host" msgstr "מארח לא ידוע" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6031,8 +6663,16 @@ msgstr "מבטל..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "שגיאה בזמן הניתוח." +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "קבצי שרת OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6076,7 +6716,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "מחק איבר \"{0}\" ביחס." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6122,5 +6762,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6140,15 +6780,20 @@ msgstr "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "עדכן תוספים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6161,21 +6806,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "לא יכול להוריד תוסף: {0} מ{1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6191,25 +6847,25 @@ msgstr "אזהרה - התבקשה טעינת התוסף {0}. התוסף כבר לא נדרש." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "תוסף דורש את עדכון JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "תוסף לא נמצא: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "התוסף עודכן לאחרונה לפני {0} ימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6219,21 +6875,21 @@ "'pluginmanager.warntime')." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "נטרל תוסף" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6243,5 +6899,5 @@ "הקיימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6249,19 +6905,19 @@ msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "לפי המידע בתוסף, המחבר הוא {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "האם התוסף צריך ליהיות מנוטרל?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6269,5 +6925,5 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6275,19 +6931,19 @@ msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "מידע" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "אין תיאור זמין" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6296,13 +6952,13 @@ msgstr[1] "הורד מידע על התוסף מ{0} אתרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "מידע על התוסף לא נמצא." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "כל התוספים המותקנים מעודכנים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6315,9 +6971,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "הורד תוספים חסרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6330,10 +6986,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6356,40 +7008,14 @@ msgstr "לא ידוע" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: גירסא {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "תוסף ארוז עם JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "התוסף כבר קיים" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"ארכיון התוסף כבר זמין. האם אתה רוצה להוריד את הגירסא הנוכחית ולמחוק את " -"הארכיון הקיים?\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "שגיאה במחיקת קובץ התוסף: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6537,9 +7163,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "תוויות" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6711,4 +7332,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "שגיאה בעת ניתוח {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -6934,6 +7560,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" @@ -7250,37 +7876,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "שכבה ריקה" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7289,16 +7920,21 @@ msgstr "טען שכבת WMS מקובץ" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7307,14 +7943,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7355,7 +7991,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "פצל דרך" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7786,7 +8421,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "מים" @@ -8165,16 +8800,21 @@ msgstr "מצב פריט לא ידוע" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "אף תצוגה לא פתוחה - לא יכול לקבוע גבולות!" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "סיומת קובץ לא מוכרת: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8264,5 +8904,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8289,25 +8929,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8480,11 +9120,11 @@ msgstr "סוף" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8494,8 +9134,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8506,5 +9142,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8513,5 +9149,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8533,7 +9169,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9425,7 +10067,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "בניין" @@ -9439,5 +10081,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "שטח" @@ -9528,4 +10170,20 @@ msgid "{0}, ..." msgstr "{0},..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9601,36 +10259,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "הורדה אוטומטית" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "טען מחדש משטחים פגומים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9644,51 +10302,51 @@ msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "מאפייני תוסף WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "שם תפריט" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "כתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "שם תפריט (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "כתובת WMS (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "הזן שם תפריט וכתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "העתק ברירת מחדל" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "בחר שורה להעתקה" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9776,7 +10434,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9926,6 +10583,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10743,5 +11405,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "פרטי" @@ -10789,5 +11451,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "יעד" @@ -10824,5 +11486,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11054,6 +11716,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11079,6 +11741,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11104,6 +11766,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "ראשי" @@ -11129,6 +11791,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "משני" @@ -11142,5 +11804,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "שלישוני" @@ -11158,5 +11820,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "מגורים" @@ -11174,5 +11836,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "שירות" @@ -11199,6 +11861,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "בנייה" @@ -11248,5 +11910,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "כיכר" @@ -12225,5 +12887,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "ביצה" @@ -13947,27 +14609,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "ספורט" @@ -16805,8 +17467,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "אופניים" @@ -16867,6 +17529,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16877,8 +17537,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "רגל" @@ -16904,5 +17564,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "רכבת תחתית" @@ -16987,4 +17647,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -16999,8 +17660,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17020,5 +17683,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "סטנדרטי" @@ -17108,7 +17771,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "גשר" @@ -17372,15 +18035,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "מיושן" @@ -17422,5 +18085,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "סוס" @@ -17630,11 +18293,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17672,6 +18335,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "רחוב" @@ -17727,7 +18390,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17783,8 +18446,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17805,5 +18468,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17817,5 +18480,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17836,5 +18499,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17849,5 +18512,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17862,5 +18525,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "גדת נחל" @@ -17874,5 +18537,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "זרם" @@ -17886,5 +18549,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -17912,5 +18575,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "אקוודוקט" @@ -18078,13 +18741,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "מעשה אדם" @@ -18146,7 +18809,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18169,10 +18832,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18202,6 +18865,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18246,6 +18909,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18259,5 +18922,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "מסוף" @@ -18279,5 +18942,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18291,5 +18954,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18337,7 +19000,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18354,5 +19017,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "מסלול קל" @@ -18367,5 +19030,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "מסלול בינוניים" @@ -18380,5 +19043,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "מסלול מתקדמים" @@ -18393,5 +19056,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18406,5 +19069,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18419,5 +19082,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "מסלול מתחילים" @@ -18522,10 +19185,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "תחנת כח" @@ -18538,8 +19201,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "מזח" @@ -18553,5 +19214,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "צינור" @@ -18679,12 +19340,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "פנאי" @@ -18698,5 +19359,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18768,8 +19429,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18871,10 +19532,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19260,22 +19921,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19307,6 +19968,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19367,8 +20028,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "בריאות" @@ -19721,26 +20382,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "חנות" @@ -19812,8 +20473,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "מלון" @@ -19963,9 +20624,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "תיירות" @@ -20037,8 +20698,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "היסטורי" @@ -20109,8 +20770,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "ירוק" @@ -20124,5 +20785,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "מחצבה" @@ -20136,5 +20797,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20156,5 +20817,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20168,5 +20829,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "יער" @@ -20180,5 +20841,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20201,5 +20862,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "קמעוני" @@ -20213,5 +20874,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "תעשייתי" @@ -20225,5 +20886,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20237,5 +20898,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20249,5 +20910,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20304,7 +20965,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "צבאי" @@ -20318,5 +20979,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "בית עלמין" @@ -20329,5 +20990,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "פיסגה" @@ -20342,5 +21003,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "קרחון" @@ -20354,5 +21015,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "הר געש" @@ -20407,8 +21068,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "טבעי" @@ -20422,5 +21083,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20434,5 +21095,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20446,5 +21107,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "" @@ -20458,5 +21119,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "בוץ" @@ -20470,5 +21131,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "חוף" @@ -20546,8 +21207,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20595,7 +21256,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "גבול" @@ -20737,10 +21398,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "מקום" @@ -20788,6 +21449,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "כתובת" @@ -21018,10 +21679,10 @@ msgstr "" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21069,7 +21730,26 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "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 "Navigation" #~ msgstr "ניווט" @@ -21078,7 +21758,31 @@ #~ 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 "Really mark this issue as ''done''?" #~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "ארכיון התוסף כבר זמין. האם אתה רוצה להוריד את הגירסא הנוכחית ולמחוק את " +#~ "הארכיון הקיים?\n" +#~ "{0}" + #~ msgid "sports" #~ msgstr "ספורט" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 15801) +++ /applications/editors/josm/i18n/po/is.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-20 13:23+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:46+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,68 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Hjálp" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Gat ekki lesið vörpun úr stillingum. Nota EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Óvistaðar breytingar" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Vista og hætta" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Hunsa og hætta" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -94,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -101,10 +102,10 @@ msgstr "Hætta við" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -188,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Viðbætur" @@ -253,15 +254,15 @@ msgstr "Lengdargráða" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Raða hnútum í hring" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Raða völdum hnútum í hring." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -270,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -292,9 +294,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Veldu minnst fjóra hnúta" @@ -329,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "árekstri" @@ -473,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -482,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Fjarlægja" @@ -492,14 +494,15 @@ msgstr "Eyða völdum hlutum." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "" @@ -527,9 +530,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -567,16 +570,4 @@ msgstr "Hætta í forritinu." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -646,12 +637,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -659,5 +650,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Villa" @@ -678,5 +669,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -789,4 +780,18 @@ msgstr "" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -843,66 +848,24 @@ msgstr "ónefnt" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Opna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Opna skrá." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 #, java-format msgid "Could not read \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Óþekkt skráarending: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Punktar frá {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "" - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" msgstr "" @@ -974,5 +937,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Líma" @@ -1001,5 +964,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Stillingar" @@ -1045,14 +1008,19 @@ msgstr "Skipta um átt vega" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Vista þau gögn sem sjást núna." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1060,26 +1028,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tómt skjal" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Árekstrar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1087,32 +1055,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Vista OSM skrá" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Vista GPX skrá" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Vista OSM skrá" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Óþekkt skráarending" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "" @@ -1243,56 +1215,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Aðskilja vegi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Skipta upp hnút sem er notaður af mörgum vegum." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" +msgid "* One node that is used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1302,9 +1274,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1312,5 +1284,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1369,50 +1341,50 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Upphala til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Upphala öllum breytingum á OSM þjóninn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Hlutum sem verður bætt við:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Hlutum sem verður breytt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Hlutum sem verður eytt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Hlaða upp breytingum?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Hlaða upp breytingum" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Engar breytingar til að hlaða upp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1616,14 +1588,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 +msgid "Select node under cursor." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 #, java-format msgid "Insert new node into way." @@ -1632,14 +1604,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "" @@ -1659,5 +1631,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1668,5 +1640,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "" @@ -1701,10 +1673,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1727,16 +1699,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1744,29 +1716,29 @@ msgstr "Engin göng eru hlaðin til að vinna með." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -1774,26 +1746,36 @@ "gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../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:84 +#: ../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:85 +#: ../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:Gam - „Gam“ kemur ekki fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1802,47 +1784,47 @@ "fyrir hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1850,46 +1832,46 @@ "„:“ eða „ “" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../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:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1903,14 +1885,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "" @@ -1946,7 +1958,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Bæta við" @@ -1986,4 +1998,8 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -1991,63 +2007,10 @@ msgstr "Leysa {0} árekstra í {1} hlutum" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Vensl rekast á" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Fjarlægja úr venslum" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2059,167 +2022,19 @@ msgstr[1] "hnútar" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Ekki vista breytingar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "A" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Villa: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Viðvörun: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "vegur" +msgstr[1] "vegir" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2231,4 +2046,260 @@ msgstr[1] "vensl" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Vensl rekast á" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "A" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Villa: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Viðvörun: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2263,138 +2334,129 @@ msgstr[1] "{0} hnútar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Óþekkt hlutverk \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "vegur" -msgstr[1] "vegir" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2416,5 +2478,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2485,4 +2547,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2497,4 +2560,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2697,26 +2761,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Skrá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Tól" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Forstillingar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2725,21 +2789,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Möskvahamur" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Fara í möskvaham" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Hljóð" @@ -2849,4 +2913,493 @@ msgstr "Upphafsstilli" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../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:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Stök" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Fjarlægja" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Hlutverk" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2860,5 +3413,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2889,33 +3442,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Leysa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Árekstrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Breytingarárekstrar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Leysa breytingarárekstra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Árekstrar: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3075,10 +3672,4 @@ msgid "Member Of" msgstr "Stak í" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Hlutverk" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3264,8 +3855,4 @@ msgstr "Eigindi (tómt gildi eyðir eigindunum)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Stök" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3299,11 +3886,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Fjarlægja" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3358,5 +3938,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3381,5 +3961,5 @@ msgstr "já" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3406,24 +3986,24 @@ msgstr "nei" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Stök: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "" @@ -3678,10 +4258,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3720,5 +4294,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3756,53 +4330,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Sérsníða teikningu lína" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Sérsníða liti" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "Í lagi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3810,6 +4384,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3817,31 +4391,31 @@ msgstr "Veldu lit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Flytja inn hljóð" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Flytja inn myndir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3850,5 +4424,5 @@ msgstr[1] "{0} ferlar, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3857,5 +4431,5 @@ msgstr[1] "{0} leiðir, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3864,28 +4438,28 @@ msgstr[1] "{0} punktar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Tímaspan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Lengd: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Breyta í gagnalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3894,11 +4468,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3908,29 +4482,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3939,9 +4513,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3949,5 +4523,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3964,24 +4538,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4017,5 +4591,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4024,5 +4598,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4031,5 +4605,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4162,5 +4736,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "" @@ -5496,5 +6070,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Uppfæra" @@ -5506,6 +6080,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5513,4 +6086,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5869,5 +6446,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5878,15 +6455,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5896,18 +6473,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Breyta eigindum" @@ -5945,6 +6522,51 @@ msgstr "Undirbý gögn..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Punktar frá {0}" + #: ../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/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "" + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" msgstr "" @@ -6002,4 +6624,13 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 msgid "Unknown host" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." msgstr "" @@ -6029,6 +6660,14 @@ msgstr "Hætti við..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" msgstr "" @@ -6120,5 +6759,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6141,15 +6780,20 @@ "reyna síðar." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Uppfæra viðbætur" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6162,20 +6806,31 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" msgstr "" @@ -6192,25 +6847,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Viðbótin „{0}“ fannst ekki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6218,21 +6873,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Gera viðbótina óvirka" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6240,5 +6895,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6246,19 +6901,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6266,5 +6921,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6272,19 +6927,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Upplýsingar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6293,13 +6948,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6312,9 +6967,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6324,10 +6979,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6350,37 +7001,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Útgáfa {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6534,9 +7162,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Tögg" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6703,4 +7326,9 @@ #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" msgstr "" @@ -6923,6 +7551,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -7239,37 +7867,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Tómt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Vista WMS lag í skrá" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7278,16 +7911,21 @@ msgstr "Hlaða WMS lag úr skrá" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7296,14 +7934,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7344,7 +7982,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Skipta veg" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7775,7 +8412,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "vatn" @@ -8151,16 +8788,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Óþekkt skráarending: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8247,5 +8889,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8272,25 +8914,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8463,11 +9105,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8477,8 +9119,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8489,5 +9127,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8496,5 +9134,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8516,7 +9154,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9404,7 +10048,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "bygging" @@ -9418,5 +10062,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9506,4 +10150,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9580,36 +10240,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Sjálfvirkt niðurhal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9623,51 +10283,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9753,7 +10413,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9903,6 +10562,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10720,5 +11384,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10766,5 +11430,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10801,5 +11465,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11031,6 +11695,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "hraðbraut" @@ -11056,6 +11720,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "stofnvegur" @@ -11081,6 +11745,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "" @@ -11106,6 +11770,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "" @@ -11119,5 +11783,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11135,5 +11799,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "íbúðargata" @@ -11151,5 +11815,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11176,6 +11840,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "byggingarsvæði" @@ -11225,5 +11889,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "hringtorg" @@ -12202,5 +12866,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -13924,27 +14588,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "íþrótt" @@ -16782,8 +17446,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "hjól" @@ -16844,6 +17508,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16854,8 +17516,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "fótgangandi" @@ -16881,5 +17543,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "" @@ -16964,4 +17626,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -16976,8 +17639,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -16997,5 +17662,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17085,7 +17750,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "brú" @@ -17349,15 +18014,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17399,5 +18064,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17607,11 +18272,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17649,6 +18314,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "stræti" @@ -17704,7 +18369,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17760,8 +18425,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17782,5 +18447,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17794,5 +18459,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17813,5 +18478,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "beygjuhringur" @@ -17826,5 +18491,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17839,5 +18504,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "árbakki" @@ -17851,5 +18516,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "lækur" @@ -17863,5 +18528,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -17889,5 +18554,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18055,13 +18720,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18123,7 +18788,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18146,10 +18811,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18179,6 +18844,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18223,6 +18888,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18236,5 +18901,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18256,5 +18921,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18268,5 +18933,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18314,7 +18979,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "skíðalyfta" @@ -18331,5 +18996,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18344,5 +19009,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18357,5 +19022,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18370,5 +19035,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18383,5 +19048,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18396,5 +19061,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18499,10 +19164,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18515,8 +19180,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "bryggja" @@ -18530,5 +19193,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "leiðsla" @@ -18656,12 +19319,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "frístundir" @@ -18675,5 +19338,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "smábátahöfn" @@ -18745,8 +19408,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18848,10 +19511,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19237,22 +19900,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19284,6 +19947,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19344,8 +20007,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19698,26 +20361,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "" @@ -19789,8 +20452,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hótel" @@ -19940,9 +20603,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "ferðamennska" @@ -20014,8 +20677,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "" @@ -20086,8 +20749,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20101,5 +20764,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "" @@ -20113,5 +20776,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20133,5 +20796,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20145,5 +20808,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "skógur (ræktaður)" @@ -20157,5 +20820,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20178,5 +20841,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "smásala" @@ -20190,5 +20853,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "iðnaður" @@ -20202,5 +20865,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20214,5 +20877,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20226,5 +20889,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20281,7 +20944,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "" @@ -20295,5 +20958,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "" @@ -20306,5 +20969,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "tindur" @@ -20319,5 +20982,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "jökul" @@ -20331,5 +20994,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "eldfjall" @@ -20384,8 +21047,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20399,5 +21062,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20411,5 +21074,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20423,5 +21086,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "skógur" @@ -20435,5 +21098,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "leðja" @@ -20447,5 +21110,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "strönd" @@ -20523,8 +21186,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20572,7 +21235,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "" @@ -20714,10 +21377,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20765,6 +21428,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "" @@ -20995,10 +21658,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21046,4 +21709,26 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21053,7 +21738,4 @@ #~ "músina. Velja: Smellið" -#~ msgid "Commit comment" -#~ msgstr "Staðfesta umsögn" - #~ msgid "Charge" #~ msgstr "Gjaldtaka" @@ -21062,4 +21744,7 @@ #~ 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 "sports" #~ msgstr "íþróttir" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 15801) +++ /applications/editors/josm/i18n/po/it.po (revision 15802) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-23 11:23+0000\n" -"Last-Translator: FabC \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-08 08:58+0000\n" +"Last-Translator: Davide Prade \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:15+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -22,18 +22,18 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -"La proiezione non può essere letta dalle preferenze. Si utilizzerà EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +"La proiezione non può essere letta dalle preferenze. Verrà utilizzata quella " +"di Mercatore" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -41,53 +41,55 @@ "server." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Modifiche non salvate" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Salva ed Esci" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Annulla ed Esci" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +97,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +104,10 @@ msgstr "Annulla" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Estensioni" @@ -254,15 +256,15 @@ msgstr "Longitudine" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Disponi i nodi in cerchio" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +273,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +296,9 @@ msgstr "Strumenti: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Alcuni nodi sono (quasi) in linea" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Selezionare almeno quattro nodi." @@ -330,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflitto" @@ -476,5 +479,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -485,7 +488,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Cancella" @@ -495,14 +498,15 @@ msgstr "Cancella gli oggetti selezionati." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Sovrascrivi" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Il file esiste. Sovrascriverlo?" @@ -530,9 +534,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -570,16 +574,4 @@ msgstr "Esci dall'applicazione." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Server dei File di OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Files GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Files NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -653,12 +645,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -666,5 +658,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Errore" @@ -685,5 +677,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -800,4 +792,18 @@ msgstr "Unisci {0} nodi" +#: ../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:70 +msgid "Mirror" +msgstr "Rispecchia" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "Rispecchia i nodi ed i percorsi selezionati." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Selezionare almeno un nodo o percorso." + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -854,67 +860,25 @@ msgstr "Senza nome" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Apri..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Apri un file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Impossibile interpretare {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Estensione del file sconosciuta: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Marcatori da {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Coordinate importate: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Formato non corretto: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Errori di checksum: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Frase sconosciuta " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Coordinate iniziali " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA importato con successo" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Importazione NMEA non riuscita!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -990,5 +954,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Incolla" @@ -1017,5 +981,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Preferenze" @@ -1061,14 +1025,19 @@ msgstr "Inverti la direzione dei percorsi" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Salva" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Salva i dati attuali." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Il file {0} esiste. Sovrascrivere?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1078,26 +1047,26 @@ "questo come bug." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Documento vuoto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Il documento non contiene dati" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Salva comunque" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflitti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1107,32 +1076,36 @@ "gestiti come se si fossero stati tutti rifiutati. Continuare?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Rifiuta i conflitti e Salva" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Salva file OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Salva in un file GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Salva file OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Salva livello" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Impossibile creare una copia di backup." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "L'estensione del file è sconosciuta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Si è verificato un errore durante il salvataggio." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Errore durante il ripristino di un file di backup." @@ -1274,55 +1247,55 @@ msgstr "Attiva o disattiva l''impostazione globale ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Separa percorsi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplica i nodi usati da più percorsi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Selezionare uno di questi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Un nodo etichettato, oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Un percorso che ha uno o più nodi che sono usati da più di un percorso, " +"oppure" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Un percorso che ha uno o più nodi che sono usati da più di un percorso, " -"oppure" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1330,5 +1303,5 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1343,9 +1316,9 @@ "e tutti i nodi saranno selezionati." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Nodo staccato" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1353,5 +1326,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1415,50 +1388,50 @@ "desidera continuare?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Carica su OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Carica tutti i cambiamenti sul server OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Oggetti da aggiungere:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Oggetti da modificare:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Caricare questi cambiamenti?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Carica le modifiche" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Nessun cambiamento da caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1666,14 +1639,14 @@ msgstr "Aggiungi un nodo al percorso e connetti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Crea un nuovo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Seleziona il nodo sotto il cursore." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1682,14 +1655,14 @@ msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Inizia un nuovo percorso dall'ultimo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Continua un percorso dall'ultimo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Termina tracciamento." @@ -1709,5 +1682,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1722,5 +1695,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Rilascia il bottone del mouse per interrompere la rotazione." @@ -1760,5 +1733,5 @@ msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1767,5 +1740,5 @@ "più vicino." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1794,16 +1767,16 @@ "di ingrandimento con il tasto destro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1811,55 +1784,68 @@ msgstr "Nessun dato caricato." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1867,43 +1853,47 @@ "type: - tipo dell''oggetto (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +"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 "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +"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 "" @@ -1911,5 +1901,5 @@ "logico ''or''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1917,46 +1907,46 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1974,15 +1964,51 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Token inaspettato: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Argomenti mancanti per l'operatore booleano OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Argomento mancante per l'operatore booleano NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +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:595 +#, 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:602 +#, 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:33 @@ -2017,7 +2043,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Aggiungi" @@ -2057,4 +2083,8 @@ msgstr "Imposta {0}={1} per {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "CambiaRuoloMembroRelazione" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2062,65 +2092,10 @@ msgstr "Risolvere {0} conflitti in {1} oggetti" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Cancella {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Cancella {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Conflitto tra relazioni" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Elimina dalla relazione" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Sposta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2132,172 +2107,19 @@ msgstr[1] "nodi" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Rimuovi un membro dalla relazione" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Ruota" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sequenza" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Applicare?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Applica i cambiamenti selezionati" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Non applicare cambiamenti" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Proprietà di " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Regole nelle relazioni a cui si riferiscono" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Correzione automatica etichette" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Impossibile aprire la cartella delle preferenze: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "diverso" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "cancellato" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "vero" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falso" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "posizione" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Gradi Decimali" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Gradi Minuti Secondi" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "incompleto" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Errore: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Attenzione: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "percorso" +msgstr[1] "percorsi" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2309,4 +2131,267 @@ msgstr[1] "relazioni" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Cancella {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Cancella {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Conflitto tra relazioni" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Sposta" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Rimuovi un membro dalla relazione" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Ruota" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sequenza" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, 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/VersionConflictResolveCommand.java:57 +#, 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:52 +#, 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/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Applicare?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "diverso" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "cancellato" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "vero" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falso" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "posizione" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Gradi Decimali" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Gradi Minuti Secondi" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Errore: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Attenzione: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2341,138 +2426,129 @@ msgstr[1] "{0} nodi" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Il percorso dello stile dell''area non è chiuso." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "il percorso multi-poligonale ''{0}'' non è chiuso." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Membro vuoto nella relazione." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Eliminato il membro ''{0}'' nella relazione." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Percorso ''{0}'' con meno di due punti." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "E' stato trovato più di un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "E' stato trovato più di un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "E' stata trovata più di una \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Ruolo ''{0}'' sconosciuto." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo di membro sconosciuto per ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Non è stato trovato un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Non è stato trovato un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Non è stato trovato alcun nodo o percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Non è stato trovato lo stile per la restrizione {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-percorso ''{0}'' nel multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Nessun percorso esterno per il multi-poligono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Il percorso interno ''{0}'' è esterno." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Lo stile per il percorso esterno ''{0}'' è discordante." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "senza etichetta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "testo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "percorso" -msgstr[1] "percorsi" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2494,5 +2570,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2579,4 +2655,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2591,4 +2668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2804,26 +2882,26 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Preimpostati" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2832,21 +2910,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Abilita/disabilita la visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Abilita/disabilita visualizzazione a schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2957,4 +3035,525 @@ msgstr "Inizializzazione" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "Il mio con il loro" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "Il mio con l'unione" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "Il loro con l'unione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "il ruolo {0} non partecipa nella comparazione {1}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Etichette" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Membri" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +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:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "Etichette({0} conflitti)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, 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:104 +msgid "Nodes(resolved)" +msgstr "Nodi(risolti)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgid "" +"Merged node list frozen. No pending conflicts in the node list of this way" +msgstr "" +"Lista di nodi uniti bloccata. Nella lista di nodi di questo percorso non c'è " +"alcun conflitto in attesa" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +msgid "Nodes(with conflicts)" +msgstr "Nodi(con conflitti)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +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:113 +msgid "Members(resolved)" +msgstr "Membri(risolti)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +msgid "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" +msgstr "" +"Lista dei membri uniti bloccata. Nella lista dei membri di questa relazione " +"non c'è alcun conflitto in attesa" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +msgid "Members(with conflicts)" +msgstr "Membri(con conflitti)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +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:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "Risoluzione conflitto" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "parametro attualmente fuori scala: ottenuto {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "elemento {0} non trovato nella lista" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "blocca scorrimento" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "Confronta " + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "Versione personale" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" +"Lista di elementi nell'insieme di dati personale, cioè l'insieme di dati " +"locale" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "Versione unita" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" +"Lista degli elementi uniti. Questi sostituiranno gli elementi personali non " +"appena saranno applicate le decisioni sull'unione." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "La loro versione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" +"Lista di elementi nel loro insieme di dati, cioè l'insieme dei dati del " +"server" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "> inizio" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "Copia i miei nodi selezionati all'inizio della lista dei nodi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "> fine" + +#: ../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 "" +"Copia i miei elementi selezionati alla fine della lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" +"Copia i miei elementi selezionati prima del primo elemento selezionato nella " +"lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" +"Copia i miei elementi selezionati dopo il primo elemento selezionato nella " +"lista degli elementi uniti" + +#: ../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 "" +"Copia il loro elemento selezionato all'inizio della lista degli elementi " +"uniti" + +#: ../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 "" +"Copia i loro elementi selezionati alla fine della lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" +"Copia i loro elementi selezionati prima del primo elemento selezionato nella " +"lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" +"Copia il loro elemento selezionato dopo il primo elemento selezionato nella " +"lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "Su" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "Sposta in su gli elementi selezionati di una posizione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "Giù" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "Sposta in giù le voci selezionate di una posizione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Elimina" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "Elimina le voci selezionate dalla lista degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "Blocca" + +#: ../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 "Blocca la lista attuale degli elementi uniti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +msgstr "Sblocca" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 +msgid "Unfreeze the list of merged elements and start merging" +msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" +"Clicca {0} per iniziare l'unione tra le voci " +"personali e le loro" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" +"Clicca {0} per terminare l'unione tra le voci " +"personali e le loro" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "Versione personale ({0} voce)" +msgstr[1] "Versione personale ({0} voci)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "Versione unita ({0} voce)" +msgstr[1] "Versione unita ({0} voci)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "Loro versione ({0} voce)" +msgstr[1] "Loro versione ({0} voci)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" +"adjustable {0} non ancora registrato. Non è possibile impostare la " +"partecipazione nella regolazione sincronizzata" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "adjustable {0} non ancora registrato" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "Nodo" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"L'unione dei nodi non è stata ancora bloccata. Non è possibile costruire il " +"comando di risoluzione" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "indice di colonna non atteso. Ottenuto {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Ruolo" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "Primitiva" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"nodi uniti non ancora bloccati. Non è possibile costruire il comando di " +"risoluzione" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "Loro versione (insieme dei dati del server)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr ">" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2969,5 +3568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2998,9 +3597,9 @@ msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Risolvi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -3008,25 +3607,69 @@ "sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflitto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Unisci i conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Resolvi conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Risolvi conflitto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflitti: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "Risolvi conflitti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +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:164 +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:165 +msgid "Apply Resolution" +msgstr "Applica risoluzione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "Applica risoluzioni parziali" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "Continua risoluzione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Attenzione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3188,10 +3831,4 @@ msgid "Member Of" msgstr "Membro di" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Ruolo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3379,8 +4016,4 @@ msgstr "Etichette (un valore vuoto cancella l'etichetta)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Membri" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3414,11 +4047,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Elimina" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3474,5 +4100,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3497,5 +4123,5 @@ msgstr "si" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3522,24 +4148,24 @@ msgstr "no" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Membri: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relazione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Si sono verificati dei conflitti durante l'importazione." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Errore di scansione nella risposta del server." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Impossibile connettersi al server." @@ -3798,10 +4424,4 @@ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Attenzione" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3840,5 +4460,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3876,53 +4496,53 @@ msgstr "Impossibile decodificare l'orario inserito." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Personalizza disegno linee" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Usa le impostazioni globali." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Non disegnare le linee tra i punti di questo livello." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Seleziona le opzioni per il disegno delle linee" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Personalizza colori" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3930,6 +4550,6 @@ msgstr "Predefinito" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3937,31 +4557,31 @@ msgstr "Scegli un colore" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Crea marcatori dai punti con nome" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Nomina i punti del percorso da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importa l'audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Files audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Marcatori audio da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importa immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3970,5 +4590,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3977,5 +4597,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3984,28 +4604,28 @@ msgstr[1] "{0} punti del percorso" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Descrizione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Timespan/Arco di tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Lunghezza: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Converti in livello dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -4016,11 +4636,11 @@ "considerato dannoso.
Se si desidera caricare delle tracce, vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4030,29 +4650,29 @@ msgstr "Convertito da: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Scarica tutto entro:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4063,9 +4683,9 @@ "vuole procedere?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4076,5 +4696,5 @@ "all'inizio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4093,24 +4713,24 @@ msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} eliminati)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4146,5 +4766,5 @@ msgstr[1] "punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4153,5 +4773,5 @@ msgstr[1] "una traccia con {0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4160,5 +4780,5 @@ msgstr[1] "{0} è composto da {1} tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4297,5 +4917,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Scegli la riga da cancellare." @@ -5676,5 +6296,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Aggiorna" @@ -5686,7 +6306,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5694,4 +6313,8 @@ msgid "Please select an entry." msgstr "Seleziona una voce." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6088,5 +6711,5 @@ msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6097,15 +6720,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6115,18 +6738,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -6164,8 +6787,53 @@ msgstr "Preparazione dei dati in corso..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Files GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Marcatori da {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "" "Errore di scansione: struttura del documento non valida per un documento gpx" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Files NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Coordinate importate: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Formato non corretto: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Errori di checksum: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Frase sconosciuta " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Coordinate iniziali " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA importato con successo" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Importazione NMEA non riuscita!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6196,9 +6864,9 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 msgid "Opening changeset..." -msgstr "Apertura del changeset..." +msgstr "Apertura del gruppo di modifiche..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 msgid "Closing changeset..." -msgstr "Chiusura del changeset..." +msgstr "Chiusura del gruppo di modifiche..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 @@ -6228,4 +6896,13 @@ msgid "Unknown host" msgstr "Host sconosciuto" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "File compressi bzip2 del server OSM" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "File bz2 non valido." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6254,8 +6931,16 @@ msgstr "Interruzione in corso" +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "File compressi gzip del server OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Errore nella scansione." +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "Server dei File di OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6286,5 +6971,5 @@ #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" +msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 @@ -6292,14 +6977,17 @@ msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" +"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, " +"ottenuto {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" +msgstr "Manca l''attributo \"type\" sul membro {0} della relazione {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Eliminato il membro ''{0}'' nella relazione." +msgstr "" +"\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6316,9 +7004,11 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" +"Valore non permesso per l''attributo \"version\" sulla primitiva OSM con id " +"{0}, ottenuto {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Missing attribute \"version\" on OSM primitive with id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 @@ -6346,5 +7036,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6352,4 +7042,8 @@ "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/io/OsmServerReader.java:85 @@ -6368,15 +7062,20 @@ "aspetta prima di riprovare." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Aggiorna estensioni" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Scarica Estensioni" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6389,23 +7088,32 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Impossibile scaricare il plugin: {0} da {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo " -"automaticamente." +msgid "Skip download" +msgstr "Salta il download" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "Scarica estensione" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "Salta scaricamento" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6423,20 +7131,20 @@ "è più necessario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Estensione non trovata: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." @@ -6445,5 +7153,5 @@ "giorni fa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6454,21 +7162,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Disabilita estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Mantieni estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6478,5 +7186,5 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6486,10 +7194,10 @@ "dall'estensione ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6498,9 +7206,9 @@ "comunicare un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Disabilitare l'estensione?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6510,5 +7218,5 @@ "eliminare l'estensione." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6518,19 +7226,19 @@ "cui si è ottenuto JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informazioni" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "nessuna descrizione disponibile" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Maggiori dettagli" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6539,13 +7247,13 @@ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Non è stata trovata alcuna informazione sulle estensioni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Tutte le estensioni sono state aggiornate." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6558,9 +7266,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Scarica le estensioni mancanti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6573,10 +7281,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Scarica Estensioni" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6599,41 +7303,14 @@ msgstr "sconosciuto" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versione {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Estensioni fornite con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Estensione già esistente" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Il file dell''estensione è già disponibile in locale. Desideri scaricare la " -"versione aggiornata ed eliminare il vecchio archivio?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Elimina e Scarica" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Errore nell'eliminazione del file dell'estensione: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6790,9 +7467,4 @@ msgstr "Inserire la descrizione sul proprio tracciato." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Etichette" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6964,4 +7636,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Impossibile interpretare {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7197,6 +7874,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Errore durante il caricamento del file" @@ -7541,37 +8218,42 @@ "Selezionare prima uno di questi, e poi riprovare" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Livello vuoto" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Layer WMS ({0}), {1} tile scaricate" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Non è vettorializzato" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Centro del easter: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "E' stato vettorializzato" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Riquadro del comune: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "Salva livello WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7580,16 +8262,21 @@ msgstr "Carica il livello WMS da file" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "Carica livello WMS" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7600,9 +8287,9 @@ "Crearne uno nuovo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Errore nel formato della cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7611,5 +8298,5 @@ "corrente {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Errore nella zona di Lambert della cache" @@ -7650,11 +8337,10 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Dividi percorso" +msgstr "Dividi area" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Divide un'area per mezzo di un percorso senza etichette." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -7664,4 +8350,7 @@ "Remove the area from the relation before splitting it." msgstr "" +"L'area selezionata non può essere divisa perché è un membro di qualche " +"relazione.\n" +"Eliminare l'area dalla relazione prima di dividerla." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8084,7 +8773,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "acqua" @@ -8488,16 +9177,21 @@ msgstr "Stato della segnalazione sconosciuto" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Apri file visibili..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Estensione del file sconosciuta: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8593,5 +9287,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8618,25 +9312,25 @@ msgstr "Apri un elenco dei nodi dell'itinerario" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Aggiungi un livello di navigazione" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Criteri" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Più breve" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Più rapido" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Inverti il percorso" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Cancella l'itinerario" @@ -8811,11 +9505,11 @@ msgstr "fine" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Modifica etichette" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Apre la finestra per la modifica delle etichette" @@ -8825,8 +9519,4 @@ msgstr "Estensione JOSM per la modifica delle etichette" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(nessuno/a)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8837,5 +9527,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8844,5 +9534,5 @@ msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8864,8 +9554,14 @@ msgstr "Filtro" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Cancella" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9801,7 +10497,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "building" @@ -9815,5 +10511,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "area" @@ -9910,4 +10606,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -10009,9 +10721,9 @@ "Potrebbero essere presenti errori nelle coordinate." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Scaricamento automatico" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -10019,10 +10731,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10031,17 +10743,17 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Ricarica tile sbagliati" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alpha channel" @@ -10055,51 +10767,51 @@ msgstr "Apri un livello WMS vuoto per caricare i dati da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Preferenze dell'estensione WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nome del Menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Nome del menu (predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "URL WMS (Predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 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:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Copia predefinito" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Selezionare la riga da copiare." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Sovrapponi tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% di lat:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% di lon:" @@ -10185,4 +10897,6 @@ "Creating and handling address nodes and buildings within Czech Republic." msgstr "" +"Creazione e gestione degli indirizzi di nodi ed edifici all'interno della " +"Repubblica Ceca." #. Plugin DirectUpload @@ -10203,12 +10917,7 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10393,6 +11102,11 @@ "Correttore ortografico integrato per i nomi delle etichette." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11212,5 +11926,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privato" @@ -11258,5 +11972,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "destinazione" @@ -11293,5 +12007,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permesso" @@ -11523,6 +12237,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "motorway" @@ -11548,6 +12262,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "trunk" @@ -11573,6 +12287,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "primary" @@ -11598,6 +12312,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "secondary" @@ -11611,5 +12325,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "tertiary" @@ -11627,5 +12341,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "residential" @@ -11643,5 +12357,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "service" @@ -11668,6 +12382,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "construction" @@ -11717,5 +12431,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rotatoria" @@ -12694,5 +13408,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "palude alluvionale" @@ -14416,27 +15130,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -17275,8 +17989,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bicicletta" @@ -17337,6 +18051,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17347,8 +18059,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "pedone" @@ -17374,5 +18086,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metropolitana" @@ -17457,4 +18169,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17469,8 +18182,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17490,5 +18205,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17578,7 +18293,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "ponte" @@ -17842,15 +18557,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "deprecato" @@ -17892,5 +18607,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "cavallo" @@ -18100,11 +18815,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "barriera" @@ -18142,6 +18857,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "strada" @@ -18197,7 +18912,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "tracciato_stradale" @@ -18253,8 +18968,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "ferrovia" @@ -18275,5 +18990,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "servizi" @@ -18287,5 +19002,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "guado" @@ -18306,5 +19021,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "slargo per inversione di marcia" @@ -18319,5 +19034,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "punto di accesso di emergenza" @@ -18332,5 +19047,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "sponda" @@ -18344,5 +19059,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "torrente" @@ -18356,5 +19071,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "darsena" @@ -18382,5 +19097,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "acquedotto" @@ -18548,13 +19263,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "costruzioni umane" @@ -18616,7 +19331,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "punto ferroviario" @@ -18639,10 +19354,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "altro_ferrovia" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "ferrovia (sopra)" @@ -18672,6 +19387,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "vecchia_ferrovia" @@ -18716,6 +19431,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "aeroporto" @@ -18729,5 +19444,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18749,5 +19464,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "aeroporto (scuro)" @@ -18761,5 +19476,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "aeroporto (chiaro)" @@ -18807,7 +19522,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "struttura_di_risalita" @@ -18824,5 +19539,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "pista_facile" @@ -18837,5 +19552,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "pista_intermedia" @@ -18850,5 +19565,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "pista_avanzata" @@ -18863,5 +19578,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "pista esperto" @@ -18876,5 +19591,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "pista_libera" @@ -18889,5 +19604,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "pista_principiante" @@ -18992,10 +19707,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "elettricità" @@ -19008,8 +19723,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "pontile" @@ -19023,5 +19736,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "conduttura" @@ -19149,12 +19862,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "struttura per lo svago" @@ -19168,5 +19881,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "porto turistico" @@ -19238,8 +19951,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "struttura di servizio" @@ -19341,10 +20054,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "servizio al traffico" @@ -19730,22 +20443,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "struttura di servizio (chiaro)" @@ -19777,6 +20490,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "acqua (chiaro)" @@ -19837,8 +20550,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "salute" @@ -20191,26 +20904,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "negozio" @@ -20282,8 +20995,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20433,9 +21146,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turismo" @@ -20507,8 +21220,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "attrazione storica" @@ -20579,8 +21292,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "verde" @@ -20594,5 +21307,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "cava/miniera" @@ -20606,5 +21319,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "discarica" @@ -20626,5 +21339,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "bacino" @@ -20638,5 +21351,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "foresta" @@ -20650,5 +21363,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "aia" @@ -20671,5 +21384,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "area commerciale (negozi)" @@ -20683,5 +21396,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industriale" @@ -20695,5 +21408,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "ridestinazione d'uso" @@ -20707,5 +21420,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "area agricola destinata alla costruzione" @@ -20719,5 +21432,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "area ferroviaria" @@ -20774,7 +21487,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "militare" @@ -20788,5 +21501,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cimitero" @@ -20799,5 +21512,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "picco montuoso" @@ -20812,5 +21525,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "ghiacciaio" @@ -20824,5 +21537,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulcano" @@ -20877,8 +21590,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "elemento naturale" @@ -20892,5 +21605,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "boscaglia" @@ -20904,5 +21617,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "brughiera" @@ -20916,5 +21629,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "bosco" @@ -20928,5 +21641,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "zona fangosa (sabbie mobili)" @@ -20940,5 +21653,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "spiaggia" @@ -21016,8 +21729,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "percorso" @@ -21065,7 +21778,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "confine" @@ -21207,10 +21920,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "luogo" @@ -21258,6 +21971,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "indirizzo" @@ -21488,10 +22201,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21539,4 +22252,32 @@ msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." + +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21546,10 +22287,4 @@ #~ "il mouse tenendo premuto il tasto destro. Selezionare: click." -#~ msgid "Commit comment" -#~ msgstr "Inserisci commento" - -#~ msgid "Navigation" -#~ msgstr "Navigazione" - #~ msgid "Charge" #~ msgstr "Costo" @@ -21561,4 +22296,13 @@ #~ 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 "Drawbridge" #~ msgstr "Ponte levatoio" @@ -21570,4 +22314,22 @@ #~ msgstr "Saracinesca" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo " +#~ "automaticamente." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare " +#~ "la versione aggiornata ed eliminare il vecchio archivio?\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "viadotto" @@ -21576,4 +22338,7 @@ #~ msgstr "Articoli sportivi" +#~ msgid "Delete and Download" +#~ msgstr "Elimina e Scarica" + #~ msgid "Edit Drawbridge" #~ msgstr "Modifica ponte levatoio" @@ -21581,4 +22346,14 @@ #~ msgid "Edit Portcullis" #~ msgstr "Modifica saracinesca" + +#~ 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" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 15801) +++ /applications/editors/josm/i18n/po/ja.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-21 07:14+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-28 19:10+0000\n" "Last-Translator: nazotoko \n" "Language-Team: Japanese \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,70 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "投影法が設定から読み取れませんでした。EPSG:4326を使用します。" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "投影法が設定から読み取れません。メルカトル図法を使います。" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。" -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "保存されていない変更" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "保存されていない変更があります。変更分を破棄して継続しますか？" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "保存して終了" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "変更を破棄して終了" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +96,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +103,10 @@ msgstr "キャンセル" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "プラグイン" @@ -254,15 +255,15 @@ msgstr "経度" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "ノードを円形に配列" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "選択したノードを円形に移動します" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +272,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +295,9 @@ msgstr "ツール: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "ノードの一部は（ほぼ）一直線上にある" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "少なくとも４つのノードを選択してください。" @@ -330,5 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "競合" @@ -473,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -482,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "削除" @@ -492,14 +494,15 @@ msgstr "選択したオブジェクトを削除します" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "上書きする" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "ファイルが存在します。上書きしますか？" @@ -527,9 +530,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -567,16 +570,4 @@ msgstr "アプリケーションを終了します。" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSMサーバファイル" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPXファイル" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183ファイル" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -650,12 +641,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -663,5 +654,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "エラー" @@ -682,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -754,5 +745,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 msgid "Join Node and Line" -msgstr "ノードと線のJoin" +msgstr "ノードと線をつなぐ" #: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 @@ -797,4 +788,18 @@ msgstr "{0}ノードを結合する" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -851,67 +856,25 @@ msgstr "名前なし" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "開く..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "ファイルを開く" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "{0}の解析中にエラー" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "ファイルの拡張子が不明です: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "{0} からのオーディオマーカー" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "座標をインポートしました。 " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "不正なセンテンス: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "チェックサムエラー " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "不明なセンテンス: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "ゼロ座標: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEAインポートの成功" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEAインポートの失敗！" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -985,5 +948,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "貼り付け" @@ -1013,5 +976,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "設定" @@ -1057,14 +1020,19 @@ msgstr "ウェイ方向反転" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "最新データを保存します。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1074,26 +1042,26 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "一つも開かれたデータがありませんんで、保存されません。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "空の文書" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "文書にデータが含まれない" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "それでも保存する" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "競合" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1103,32 +1071,36 @@ "れます。続けますか？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "競合を否定して保存する" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "OSMファイルの保存" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "GPXファイルの保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "OSMファイルの保存" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "ファイルをバックアップできませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "ファイルの拡張子が不明です" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "保存中にエラー発生" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "バックアップファイルから復元するときに、エラーになりました。" @@ -1259,5 +1231,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." -msgstr "元gpsポイント間に線を描画" +msgstr "生gpsポイント間に線を描画" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1266,58 +1238,58 @@ msgstr "グローバル設定 \"{0}\"　のトグル" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "ウェイを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "複数のウェイに使われているノードを複製します。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "このノードは、何とも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "どのノードも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "どのウェイも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "現在の選択は引き離せません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "ほかを選択：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* 1つのタグのついたノード、または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "* One node that is used by more than one way, or" msgstr "* 1つ以上のウェイに使われている1つのノード, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1332,9 +1304,9 @@ "コピーが作られ、全てのノードが選択状態になります。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "ノードを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1342,5 +1314,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1402,50 +1374,50 @@ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "OSMにアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "OSMサーバにすべての変更をアップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "追加するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "修正するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "削除するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "アップロードする変更の概略コメントを入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "この変更をアップロードしますか?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "変更のアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "未解決の競合があります。まずこれらの競合を解決してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1651,14 +1623,14 @@ msgstr "ウェイのノードを追加して接続" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "新規ノードの作成" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "カーソルの下のノードを選択" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1666,14 +1638,14 @@ msgstr[0] "新規ノードを {0}このウエイに追加します。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "新規ウエイを最後に操作したノードから開始" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "最後に操作したノードからウエイを継続" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "描画の完了" @@ -1693,5 +1665,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" @@ -1702,5 +1674,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "回転を止めるには、マウスボタンを放します。" @@ -1736,5 +1708,5 @@ msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1743,5 +1715,5 @@ "マージします。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1768,16 +1740,16 @@ "移動; 右ドラッグによるズーム" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1785,55 +1757,65 @@ msgstr "データが読み込まれていません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "セレクションを置換" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "セレクションに加える" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "セレクションの削除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "大/小文字を区別する" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "正規表現検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "特殊なターゲット:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1841,92 +1823,92 @@ "type: - オブジェクトの型 (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" + +#: ../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:98 +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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1944,15 +1926,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." msgstr "閉じ括弧があるはずです。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1987,7 +1999,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "追加" @@ -2026,4 +2038,8 @@ msgstr "Set {0}={1} for {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ChangeRelationMemberRole" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2031,65 +2047,10 @@ msgstr "{1}個のオブジェクト中の{0}個の競合を解決" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "削除 {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "削除 {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "競合中のリレーション" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "関連から削除" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -msgid "Split way segment" -msgstr "ウェイのセグメントを分割" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "移動" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2100,170 +2061,18 @@ msgstr[0] "ノード" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "RemoveRelationMember" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "回転" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "シーケンス" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "適用しますか?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "選択した変更を適用します" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "変更を適用しません" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "適用したいプロパティの変更を選択してください。" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "プロパティ " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "次を参照する関連中のロール" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "自動タグ修正" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "不正な設定がファイルの{0}行目にあります。" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "情報ディレクトリを読み取れません: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "差異" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "削除された" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "真" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "偽" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "位置" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "十進経緯度" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "度分秒" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "南" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "北" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "西" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "東" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "不完全" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Error: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Warning: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "ウェイ" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2274,4 +2083,265 @@ msgstr[0] "関連" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "削除 {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "削除 {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "競合中のリレーション" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +msgid "Split way segment" +msgstr "ウェイのセグメントを分割" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "移動" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "RemoveRelationMember" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "回転" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "シーケンス" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "適用しますか?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "差異" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "削除された" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "真" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "偽" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "位置" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "十進経緯度" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "度分秒" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "南" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "北" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "西" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "東" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "不完全" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Error: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Warning: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2304,137 +2374,129 @@ msgstr[0] "{0}ノード" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "領域を指定するウエイが閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "リレーションに登録すべきものがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "メンバー \"{0}\"を関連から削除" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "ウエイ\"{0}\"は二つ未満のポイントです。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "二つ以上の\"from\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "二つ以上の\"to\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "経由地が複数有ります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "不明なロール\"{0}\"です。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "{0}のメンバーのタイプが不明" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "\"from\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "\"to\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "経由地かウエイが見つかりません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "制約条件{0}のスタイルがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "内部のウェイ ''{0}''が外側にあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "タグ付いていない" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "テキスト" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "ウェイ" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2456,5 +2518,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2520,8 +2582,14 @@ "Do not upload any data after this message." msgstr "" +"投影法 \"{0}\" は、\n" +"緯度 45.7°から 47.9°で\n" +"経度 5.7°から 10.6°まで用です。\n" +"スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n" +"違う投影系を使ってください。\n" +"このメッセージ以降のデータはアップロードしないでください。" #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138 msgid "Swiss Grid (Switzerland)" -msgstr "" +msgstr "スイスグリッド (スイス)" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 @@ -2535,4 +2603,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2547,4 +2616,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2752,28 +2822,28 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +msgstr "設定 {0} はもう使われていないので、除かれました。" + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "ファイル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2782,21 +2852,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "ワイヤー・フレーム表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "ワイヤー・フレーム表示切り替え" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "全画面表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "フルスクリーン表示のトグル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "音声" @@ -2906,4 +2976,493 @@ msgstr "初期化" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "タグ" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "メンバー" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "削除" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "役割" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2917,5 +3476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2946,33 +3505,77 @@ msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "競合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "競合点の統合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "競合の解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "矛盾の解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "競合: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "警告" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3132,10 +3735,4 @@ msgid "Member Of" msgstr "メンバー" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "役割" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3313,5 +3910,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "linked" -msgstr "" +msgstr "継げられた" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:195 @@ -3319,8 +3916,4 @@ msgstr "タグ（空の値でタグ自身を削除）" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "メンバー" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3354,11 +3947,4 @@ msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3413,5 +3999,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3436,5 +4022,5 @@ msgstr "はい" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3461,24 +4047,24 @@ msgstr "いいえ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "メンバー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "関連の編集者:{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "インポート中に競合を発見しました。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "サーバからの応答内容が不正です。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "サーバに接続できません。" @@ -3731,11 +4317,5 @@ #, java-format msgid "Image with path {0} does not exist or is not readable." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "警告" +msgstr "パス {0} にあるイメージは存在しないか、読めません。" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 @@ -3774,5 +4354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3799,5 +4379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502 msgid "GPS unit timezone (difference to photo)" -msgstr "GPSユニットのタイムゾーン(写真とは違います)" +msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510 @@ -3810,53 +4390,53 @@ msgstr "入力した時刻は、解釈できません" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "GPSポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "線描画のカスタマイズ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "全体設定を使用" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引く。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引かない。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "線描画オプションの選択" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "配色のカスタマイズ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3864,6 +4444,6 @@ msgstr "既定" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3871,31 +4451,31 @@ msgstr "色選択" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "名前のついた地点からのマーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "{0} からの名前付きトラックポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "音声のインポート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "WAV音声ファイル(*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "{0} からの音声マーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "イメージのインポート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3903,5 +4483,5 @@ msgstr[0] "{0} トラック " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3909,5 +4489,5 @@ msgstr[0] "{0}ルート, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3915,28 +4495,28 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "名前: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "記述: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "長さ: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "データレイヤーへ変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3948,11 +4528,11 @@ "てください：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3962,29 +4542,29 @@ msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3995,9 +4575,9 @@ "すか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4007,5 +4587,5 @@ "に変更又は移動されました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4022,26 +4602,26 @@ #, java-format msgid "version {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +msgstr "バージョン {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0}は削除されました)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +msgstr "設定解除" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +msgstr "APIバージョン: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4075,5 +4655,5 @@ msgstr[0] "ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4081,5 +4661,5 @@ msgstr[0] "{0}ポイントをもつトラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4087,5 +4667,5 @@ msgstr[0] "{1}トラックを含む {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4221,5 +4801,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "削除する列を選択してください。" @@ -5405,9 +5985,9 @@ "Maximum length (in meters) to draw lines for local files. Set to '-1' to " "draw all lines." -msgstr "" +msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 msgid "Maximum length for local files (meters)" -msgstr "" +msgstr "ローカルファイルに対する最大長 (メートル)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 @@ -5571,5 +6151,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "アップデート" @@ -5581,7 +6161,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "site-josm.xmlかWikiページを追加する。" +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5589,4 +6168,8 @@ msgid "Please select an entry." msgstr "エントリーを選択してください。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5954,5 +6537,5 @@ msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5963,15 +6546,15 @@ msgstr "タグの事前設定ソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5980,18 +6563,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "プロパティを変更する" @@ -6029,11 +6612,56 @@ msgstr "データを準備中..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPXファイル" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "{0} からのオーディオマーカー" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183ファイル" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "座標をインポートしました。 " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "不正なセンテンス: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "チェックサムエラー " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "不明なセンテンス: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "ゼロ座標: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEAインポートの成功" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEAインポートの失敗！" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." -msgstr "" +msgstr "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 @@ -6043,14 +6671,16 @@ "{0} to {1}." msgstr "" +"これは、プロトコールバージョン 0.5 と 0.6 をサポートしていますが、サーバー" +"は、 {0} から {1}をサポートするといっています。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 #, java-format msgid "Communications with {0} established using protocol version {1}" -msgstr "" +msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:192 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 msgid "Cannot read numeric value from response" -msgstr "" +msgstr "応答から数値を読み取れません。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 @@ -6064,5 +6694,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "No changeset present for diff upload" -msgstr "" +msgstr "diffアップロードのための変更セットを用意できませんでした。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 @@ -6078,13 +6708,22 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 msgid "Data upload failed for unknown reason" -msgstr "" +msgstr "不明な理由でデータのアップロードに失敗しました。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 msgid "Not initialized" -msgstr "" +msgstr "初期化されていません。" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 msgid "Unknown host" msgstr "不明なホスト" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6113,8 +6752,16 @@ msgstr "中止します..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "パース中にエラーが発生しています" +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "OSMサーバファイル" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6123,10 +6770,10 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161 msgid "Version number missing from OSM data" -msgstr "" +msgstr "OSMデータにバージョン番号が欠けています。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163 #, java-format msgid "Unknown version: {0}" -msgstr "" +msgstr "不明なバージョン: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 @@ -6145,5 +6792,5 @@ #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" +msgstr "リレーション {0}のメンバーに属性\"ref\"がかけています。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 @@ -6158,7 +6805,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "メンバー \"{0}\"を関連から削除" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6204,5 +6851,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6224,15 +6871,20 @@ "試してください。" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "プラグインのアップデート" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "ダウンロードプラグイン" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6245,21 +6897,32 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" -"プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "{1}からプラグイン: {0}をダウンロードできません" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6277,10 +6940,10 @@ "ありません。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "プラグインはJPSMのアップデートを要求しています: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -6288,15 +6951,15 @@ "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "プラグインが見つかりません： {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "プラグインの更新が最後に行われてから{0}日以上経過しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6306,21 +6969,21 @@ "たつと出るか、変更できます。)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "このプラグインを使用不可にする" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "プラグイン {0} を読み込めません。設定から削除しますか？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "プラグインを継続" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6330,5 +6993,5 @@ "上書きできる権限があるかどうか、確認してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6336,10 +6999,10 @@ msgstr "\"{0}\"プラグインで、予期せぬ例外が発生しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "このプラグインから得られる情報では、作者は {0} です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6348,9 +7011,9 @@ "い。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "このプラグインを使用不可にしますか?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6360,5 +7023,5 @@ "再起動してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6367,19 +7030,19 @@ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "情報" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "説明がありません" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +msgstr "もっと詳細" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6387,13 +7050,13 @@ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "プラグイン情報が見つかりません。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "インストールされた全てのプラグインは最新です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6406,9 +7069,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "不足するプラグインをダウンロードします。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6421,10 +7084,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "ダウンロードプラグイン" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6447,40 +7106,14 @@ msgstr "不明な" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "JOSMに付属のプラグイン" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "プラグインはすでに存在しています" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウ" -"ンロードしますか？\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "削除とダウンロード" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Error deleting plugin file: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6620,5 +7253,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" +msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" #. item "Relations/Route" text "Symbol description" @@ -6632,9 +7265,4 @@ msgstr "あなたのトレースについて説明を記入して下さい" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "タグ" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6806,4 +7434,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "{0}の解析中にエラー" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7040,6 +7673,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "ファイルの読み込みエラー" @@ -7362,37 +7995,42 @@ "Select one of them first, then retry" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "ブランクのレイヤー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMSレイヤー ({0}), {1}このタイル読み込み" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "ベクターではありません。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "ラスター画像の中央: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "ベクタライズされました。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "都道府県 bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7401,16 +8039,21 @@ msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "ファイルフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7419,14 +8062,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "キャッシュフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "ランベルトゾーンキャッシュエラー" @@ -7467,7 +8110,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "ウェイを分割" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7770,5 +8412,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 msgid "Looking for shoreline..." -msgstr "shorelineを検索中…" +msgstr "岸を検索中…" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 @@ -7902,9 +8544,9 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" -msgstr "湖沼・海洋" +msgstr "水域(湖沼)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -8282,16 +8924,21 @@ msgstr "不明な問題点の状況" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Visibleを開く…" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "一つもビューが開いていません。-境界を判定できません！" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "ファイルの拡張子が不明です: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8384,5 +9031,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8409,25 +9056,25 @@ msgstr "ルーティングノードのリストを開く" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "基準/条件" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "最短" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "最速" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "ルートの消去" @@ -8600,11 +9247,11 @@ msgstr "終了" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "タグの編集" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "タグ編集ダイアログの開始" @@ -8614,8 +9261,4 @@ msgstr "JOSM タグ編集プラグイン" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(なし)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8626,5 +9269,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8633,5 +9276,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8653,8 +9296,14 @@ msgstr "フィルタ" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "クリア" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9546,7 +10195,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "ビル" @@ -9560,5 +10209,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "領域" @@ -9635,5 +10284,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64 msgid "Reversed coastline: land not on left side" -msgstr "" +msgstr "海岸線の反転: 陸地が左側にありません。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69 @@ -9649,4 +10298,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9723,19 +10388,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "自動ダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9743,17 +10408,17 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "アルファチャンネル" @@ -9767,51 +10432,51 @@ msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "WMSプラグイン設定" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "メニューの名前" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "メニュー名(既定)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (既定)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "メニュー名とWMS URLを入力" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "既定のコピー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "コピーする列を選択してください。" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9903,7 +10568,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10053,6 +10717,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10870,5 +11539,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "私道" @@ -10916,5 +11585,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "行き先" @@ -10951,5 +11620,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11015,5 +11684,5 @@ #: build/trans_presets.java:1016 msgid "Motorcycle" -msgstr "バイク" +msgstr "自動二輪" #. item "Ways/Path" label "Type" @@ -11181,6 +11850,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "高速道路" @@ -11206,6 +11875,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "国道" @@ -11231,6 +11900,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "都道府県道" @@ -11256,6 +11925,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "主要道路" @@ -11269,5 +11938,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "敷地内道路" @@ -11285,5 +11954,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "敷地内道路" @@ -11301,5 +11970,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "サービス" @@ -11326,6 +11995,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "工事中" @@ -11375,5 +12044,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "ロータリー交差点" @@ -11776,5 +12445,5 @@ #: build/trans_presets.java:1307 msgid "Cross on horseback" -msgstr "馬の背で横断" +msgstr "馬用横断道" #. item "Waypoints/Traffic Signal" check "Cross on horseback" @@ -11783,5 +12452,5 @@ #: build/trans_presets.java:1308 msgid "Cross by bicycle" -msgstr "" +msgstr "自転車用横断歩道" #. item "Waypoints/Traffic Signal" check "Cross by bicycle" @@ -12012,5 +12681,5 @@ #: build/trans_presets.java:846 msgid "Cycle Barrier" -msgstr "" +msgstr "自転車止め" #. item @@ -12202,5 +12871,5 @@ #: build/trans_presets.java:1022 build/trans_presets.java:1065 msgid "Water" -msgstr "湖沼・海洋" +msgstr "水域(湖沼)" #. group "Water" @@ -12266,5 +12935,5 @@ #: build/trans_presets.java:1067 msgid "Edit Water" -msgstr "湖沼・海洋の編集" +msgstr "水域の編集" #. item "Water/Water" text "Name" @@ -12355,5 +13024,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "沼地、湿地" @@ -12387,5 +13056,5 @@ #: build/trans_presets.java:1118 msgid "Beach" -msgstr "海岸" +msgstr "砂浜" #. item @@ -12393,5 +13062,5 @@ #: build/trans_presets.java:1120 msgid "Edit Beach" -msgstr "海岸の編集" +msgstr "砂浜の編集" #. item "Water/Beach" text "Name" @@ -13541,10 +14210,10 @@ #: build/trans_presets.java:1708 msgid "Picnic Site" -msgstr "キャンプ場" +msgstr "ピクニック場(野外調理場)" #. item #: build/trans_presets.java:1709 msgid "Edit Picnic Site" -msgstr "キャンプ場の編集" +msgstr "ピクニック場の編集" #. item "Tourism/Picnic Site" check "Fireplace" @@ -14077,27 +14746,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "スポーツ" @@ -16938,8 +17607,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "自転車" @@ -17000,6 +17669,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17010,8 +17677,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "徒歩" @@ -17037,5 +17704,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "地下鉄" @@ -17120,4 +17787,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17132,8 +17800,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17153,5 +17823,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "標準" @@ -17241,7 +17911,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "橋" @@ -17505,15 +18175,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "破棄された" @@ -17555,5 +18225,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "馬" @@ -17763,11 +18433,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17805,6 +18475,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "ストリート" @@ -17860,7 +18530,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "車線" @@ -17916,8 +18586,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "線路" @@ -17938,5 +18608,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17950,5 +18620,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17969,5 +18639,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "転回所" @@ -17982,5 +18652,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17995,5 +18665,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "川岸" @@ -18007,5 +18677,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "小川" @@ -18019,5 +18689,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "ドック" @@ -18045,5 +18715,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "水道" @@ -18211,13 +18881,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "人工物" @@ -18279,7 +18949,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18302,10 +18972,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "その他の軌道" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18335,6 +19005,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "古い軌道" @@ -18379,6 +19049,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "空路" @@ -18392,5 +19062,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "駅" @@ -18412,5 +19082,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "空路（暗色）" @@ -18424,5 +19094,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "空路（明色）" @@ -18470,7 +19140,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "リフト" @@ -18487,5 +19157,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "初球者スキーコース" @@ -18500,5 +19170,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "中級者スキーコース" @@ -18513,5 +19183,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "上級者スキーコース" @@ -18526,5 +19196,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18539,5 +19209,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "フリースタイルのゲレンデ" @@ -18552,5 +19222,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "初心者スキーゲレンデ" @@ -18655,10 +19325,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "電力" @@ -18671,8 +19341,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "桟橋" @@ -18686,5 +19354,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "パイプライン" @@ -18812,12 +19480,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "レジャー" @@ -18831,5 +19499,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "マリーナ" @@ -18901,8 +19569,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "アメニティ" @@ -19004,10 +19672,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "アメニティ_交通" @@ -19393,22 +20061,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "アメニティ_信号" @@ -19440,6 +20108,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "信号_水域" @@ -19500,8 +20168,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "健康" @@ -19854,26 +20522,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "店" @@ -19945,8 +20613,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "ホテル" @@ -20096,9 +20764,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "旅行関係" @@ -20170,8 +20838,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "史跡" @@ -20242,8 +20910,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "緑" @@ -20257,5 +20925,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "石切り場" @@ -20269,5 +20937,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "埋め立て地" @@ -20289,5 +20957,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "水たまり、窪地" @@ -20301,5 +20969,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "森" @@ -20313,5 +20981,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "農地" @@ -20334,5 +21002,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "小売りの商用地" @@ -20346,5 +21014,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "工業地" @@ -20358,5 +21026,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "使用していない工業地" @@ -20370,5 +21038,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "緑地" @@ -20382,5 +21050,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "鉄道公園" @@ -20437,7 +21105,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "軍用地" @@ -20451,5 +21119,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "墓地" @@ -20462,7 +21130,7 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" -msgstr "頂上" +msgstr "山頂" #. color peak @@ -20475,5 +21143,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "氷河" @@ -20487,5 +21155,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "火山" @@ -20540,8 +21208,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "自然" @@ -20555,5 +21223,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "低木" @@ -20567,5 +21235,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "荒地" @@ -20579,5 +21247,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "森" @@ -20591,5 +21259,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "泥" @@ -20603,5 +21271,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "ビーチ" @@ -20679,8 +21347,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "ルート" @@ -20728,7 +21396,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "行政区画" @@ -20870,10 +21538,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "場所" @@ -20921,6 +21589,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "住所" @@ -21151,10 +21819,10 @@ msgstr "ランドサット" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "オープンエアリアルマップ" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21202,4 +21870,32 @@ msgstr "Streets NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xmlかWikiページを追加する。" + +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21209,10 +21905,4 @@ #~ "した状態で移動させる。選択：クリック。" -#~ msgid "Commit comment" -#~ msgstr "コメントを反映します" - -#~ msgid "Navigation" -#~ msgstr "ナビゲーション" - #~ msgid "Charge" #~ msgstr "料金" @@ -21223,4 +21913,13 @@ #~ 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}" # http://en.wikipedia.org/wiki/Draw_bridge @@ -21235,4 +21934,20 @@ #~ msgstr "城の格子戸" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" +#~ "ウンロードしますか？\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "高架橋" @@ -21240,4 +21955,7 @@ #~ msgid "sports" #~ msgstr "スポーツ店" + +#~ msgid "Delete and Download" +#~ msgstr "削除とダウンロード" # http://en.wikipedia.org/wiki/Draw_bridge Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 15801) +++ /applications/editors/josm/i18n/po/nb.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 19:12+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-03 16:44+0000\n" "Last-Translator: Svein Olav Hagen \n" "Language-Team: Norwegian Bokmal \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:15+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,68 +25,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Kartprojeksjonen ikke funnet i oppsettet. Benytter EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Tips: Noen endringer kom fra å laste opp nye data til serveren." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Ulagrede endringer" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Det er ulagrede endringer. Forkast endringene og fortsette?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Lagre og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Slett forandringer og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -94,5 +95,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -101,10 +102,10 @@ msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -188,5 +189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Programtillegg" @@ -253,15 +254,15 @@ msgstr "Lengdegrad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Juster nodene til en sirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Flytt de valgte noder i en sirkel." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -270,8 +271,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -292,9 +294,9 @@ msgstr "Verktøy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Noen av nodene er (nesten) på linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Velg minst fire noder." @@ -329,5 +331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -468,5 +470,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -477,7 +479,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Slett" @@ -487,14 +489,15 @@ msgstr "Slett valgte objekter." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Skriv over" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Filen finnes. Overskrive filen ?" @@ -522,9 +525,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -562,16 +565,4 @@ msgstr "Avslutt programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM server filer" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX filer" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 filer" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -645,12 +636,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -658,5 +649,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Feil" @@ -677,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -792,4 +783,18 @@ msgstr "Samle {0} noder" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -846,67 +851,25 @@ msgstr "uten navn" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Åpne …" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Åpne en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Feil oppsto ved sending av {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 #, java-format msgid "Could not read \"{0}\"" msgstr "Kan ikke lese {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Ukjent filtype {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markører fra {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Importerte koordinater: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Ugyldig koding: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Feil i kontrollsum: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Ukjent koding: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Koodinater med null: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA data er lest inn" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Feil ved import av NMEA data!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -980,5 +943,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Lim inn" @@ -1007,5 +970,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Alternativer" @@ -1051,14 +1014,19 @@ msgstr "Snu retning på linjer" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Lagre data" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1067,26 +1035,26 @@ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Ingen åpne dokument å lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokumentet er tomt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Lagre uansett" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1096,32 +1064,36 @@ "Fortsett?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Avvis Konflikter og Lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Lagre OSM fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Lagre GPX fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Lagre OSM fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Kan ikke ta sikkerhetskopi." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Ukjent filtype." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Det oppsto feil under lagring." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi." @@ -1255,46 +1227,46 @@ msgstr "Slå av/på global settings ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Fjern knytning til linjer" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dupliser noder som er med i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "Denne noden har ikke knytninger" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Velg :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1302,10 +1274,10 @@ "* En linje som har en eller flere noder, som er brukt av flere linjer eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1318,9 +1290,9 @@ "kopier og alle noder blir valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1328,5 +1300,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1384,50 +1356,50 @@ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Last opp til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Last opp alle endringer til OSM serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objekter som legges til:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objekter som endres:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objekter som slettes:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Laste opp disse endringene?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Last opp endringer" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1633,14 +1605,14 @@ msgstr "Legg til Node i linje og lag tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Lag ny Node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Veg Node ved markøren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1649,14 +1621,14 @@ msgstr[1] "Sett inn ny Node i {0} linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Start ny linje fra siste Node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Fortsett samme linje fra siste Node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Avslutt tegning." @@ -1676,5 +1648,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slipp museknapp for å velge objekt i rektangelet." @@ -1685,5 +1657,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Slipp museknappen for å avslutte rotasjon." @@ -1720,5 +1692,5 @@ msgstr[1] "Legg til og flytt en kunstig Node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1727,5 +1699,5 @@ "nærmeste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1753,16 +1725,16 @@ "høyre; flyttezoom med høyre museknapp" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1770,146 +1742,156 @@ msgstr "Ingen data lastet inn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 msgid "Please enter a search string." msgstr "Søk etter teksten." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "skill på store / små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "vanlig uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Nansens gate - 'Nansen' og 'gate' i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "Nansens gate - \"Nansen\" og \"gate\" i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Nan - 'Nan' finnes innen navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 +#: ../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:Nan - ingen 'Nan' innen navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot kan ha alle verdier." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 +#: ../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:88 +#: ../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:89 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "user:... - all objects changed by user" msgstr "user:... - alle object redigert av bruker (user)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "id:... - object with given ID" msgstr "id:... - objekt med gitt ID" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt med bestemt antall noder (nodes)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 msgid "modified - all changed objects" msgstr "modified - alle endrede objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "selected - all selected objects" msgstr "selected - alle objekt i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 msgid "incomplete - all incomplete objects" msgstr "incomplete - all uferdige (incomplete) objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "untagged - all untagged objects" msgstr "untagged - alle objekt uten egenskaper (untagged)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +#: ../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:97 +#: ../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:98 +#: ../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 (OR)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Bruk \" for å vise til egenskapsnavn (f.eks hvis nøkkel inneholder :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "Use ( and ) to group expressions" msgstr "Bruk parantes ( and ) ved grupper av uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../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:110 +#: ../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:173 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingen element ble lagt til utvalg etter søk etter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177 +#: ../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 utval ved søk etter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1926,15 +1908,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "OR mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "NOT mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1969,7 +1981,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Legg til" @@ -2009,4 +2021,8 @@ msgstr "Sett {0}={1} i {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2014,65 +2030,10 @@ msgstr "{0} konflikter må løses i {1} objecter" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slett {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slett {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Relasjonen har konflikter" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n" -"Slett fra relasjon?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Slett fra relasjon" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n" -"Slett fra relasjon?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -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:347 -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 " -"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ." -"
Er du sikker på at du vil slette?" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -msgid "Move" -msgstr "Flytt" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2084,169 +2045,19 @@ msgstr[1] "Node" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Fjern medlem i relasjon" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Roter" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Gjennomfør?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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 rening på linje 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 "Eks 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 "Eks nøkkel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Eks 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:39 -msgid "Apply selected changes" -msgstr "Bruk valgte endringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Ikke bruk endringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Egenskaper for " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Roller i relasjon viser til" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Korriger egenskap automatisk" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Config file har feil i linje {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åpne oppsett: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Feil i oppsett fila. Backup lagres i {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Oppsett 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 oppsett. Årsak: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Kan ikke lese oppsett fra server." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 -msgid "different" -msgstr "forskjellig" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "slettet" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "sann" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "usann" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "posisjon" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Desimalgrader" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grader Minutt Sekunder" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "Ø" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "uferdig" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Feil: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Advarsel: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "linje" +msgstr[1] "linjer" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2258,4 +2069,264 @@ msgstr[1] "Relasjoner" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Slett {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Slett {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Relasjonen har konflikter" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" +"Delete from relation?" +msgstr "" +"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n" +"Slett fra relasjon?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n" +"Slett fra relasjon?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +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:385 +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 " +"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ." +"
Er du sikker på at du vil slette?" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Flytt" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Fjern medlem i relasjon" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Roter" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Gjennomfør?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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 rening på linje 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 "Eks 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 "Eks nøkkel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Eks 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 relasjon 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 "Config file 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 oppsett: {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 oppsett fila. Backup lagres i {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Oppsett 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 oppsett. Årsak: {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 +msgid "Could not load preferences from server." +msgstr "Kan ikke lese oppsett fra server." + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 +msgid "different" +msgstr "forskjellig" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "slettet" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "sann" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "usann" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "posisjon" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Desimalgrader" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grader Minutt Sekunder" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "Ø" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "uferdig" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Feil: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Advarsel: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2290,138 +2361,129 @@ msgstr[1] "{0} Noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Linje for areal er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon linje ''{0}'' er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Tomt element in Relasjon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettet medlem ''{0}'' i relasjon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Linje ''{0}'' med færre enn to punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Funnet mere enn en linje med \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Funnet mere enn en linje med \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Funnet mere enn en \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Ukjent rolle ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Ukjent medlemstype for ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Ikke funnet linje med \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Ikke funnet linje med \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Ikke funnet linje eller Node med \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" Node ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Linje med \"to\" har ikke start eller slutt i \"via\" Node ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "linje med \"to\" har ikke start eller slutt i \"via\" linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Fant ikke style for restriksjon {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen fornuftig Rolle ''{0}'' for linje ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "I multipolygon er ''{0}'' ikke linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ingen ytre (outer) linje for multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Skjæring mellom linjene ''{0}'' og ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Indre linje (inner) ''{0}'' er utenfor." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Style for indre linje ''{0}'' er samme som multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Style for ytre linje (outer) ''{0}'' passer ikke." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "Uten egenskaper" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "linje" -msgstr[1] "linjer" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2443,5 +2505,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2528,4 +2590,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2540,4 +2603,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2748,26 +2812,26 @@ msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2776,21 +2840,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Vis akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Slå av/på akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Slå av/på fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Audio" @@ -2901,4 +2965,493 @@ msgstr "Klargjør" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Egenskaper" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Fjern" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rolle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2912,5 +3465,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2941,33 +3494,77 @@ msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Åpne en dialog for å sammenføye element i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Konflikter ved sammenføyning." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Løs Konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Løs Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Advarsel" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3128,10 +3725,4 @@ msgid "Member Of" msgstr "Medlem av" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rolle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3315,8 +3906,4 @@ msgstr "Egenskaper (tom verdi fjerner egenskap)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Medlemmer" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3350,11 +3937,4 @@ msgid "Move the currently selected members down" msgstr "Flytt valgt medlem ned" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Fjern" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3409,5 +3989,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3432,5 +4012,5 @@ msgstr "ja" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3457,24 +4037,24 @@ msgstr "nei" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Medlemmer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relasjons-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Det var konflikter ved import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Feil i oversendelse av server respons." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Kan ikke koble til serveren." @@ -3730,10 +4310,4 @@ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Advarsel" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3772,5 +4346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3808,53 +4382,53 @@ msgstr "Den indtastede tid kunne ikke tolkes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Tilpass linjetegning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Bruk globale indstillinger." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkt i dette laget." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Velg linjetegnings-innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Tilpass farge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3862,6 +4436,6 @@ msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3869,31 +4443,31 @@ msgstr "Velg en farge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Markører fra navngitte punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Navngivne sporpunkt fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importer lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave-lydfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importer bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3902,5 +4476,5 @@ msgstr[1] "{0} spor, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3909,5 +4483,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3916,28 +4490,28 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Tidshorisont: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Lengde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Konverter til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3948,11 +4522,11 @@ "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3962,29 +4536,29 @@ msgstr "Konvertert fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Last ned alt innenfor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3995,9 +4569,9 @@ "Ønsker du
å fortsette?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4007,5 +4581,5 @@ "ble utelatt eller flyttet til start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4024,24 +4598,24 @@ msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4077,5 +4651,5 @@ msgstr[1] "punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4084,5 +4658,5 @@ msgstr[1] "et GPS spor med {0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4091,5 +4665,5 @@ msgstr[1] "{0} består av {1} GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4228,5 +4802,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Velg raden som skal slettes" @@ -5581,5 +6155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Oppdater" @@ -5591,7 +6165,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Tilføy enten site-josm.xml eller Wiki-sider." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5599,4 +6172,8 @@ msgid "Please select an entry." msgstr "Velg en verdi." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5983,5 +6560,5 @@ msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5992,15 +6569,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6010,18 +6587,18 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Endre egenskaper" @@ -6059,7 +6636,52 @@ msgstr "Klargjør data..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX filer" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markører fra {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Lesefeil: Strukturen i GPX fila er ukjent" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 filer" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Importerte koordinater: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Ugyldig koding: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Feil i kontrollsum: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Ukjent koding: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Koodinater med null: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA data er lest inn" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Feil ved import av NMEA data!" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 @@ -6119,4 +6741,13 @@ msgstr "Ukjent vert" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6144,8 +6775,16 @@ msgstr "Avbryter..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM server filer" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6189,7 +6828,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Slettet medlem ''{0}'' i relasjon." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6235,5 +6874,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6257,15 +6896,20 @@ "prøver på nytt." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Opdater programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Last ned Programtillegg" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6278,22 +6922,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Kunne ikke laste programtillegg: {0} fra {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6311,10 +6965,10 @@ "behov for det." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Programtillegget krever oppdatering {0} av JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -6322,15 +6976,15 @@ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Fant ikke programtillegget: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6340,21 +6994,21 @@ "oppstettet 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Fjern programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6364,5 +7018,5 @@ "skrive over eksisterende." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6370,10 +7024,10 @@ msgstr "En uventet feil opstod som kan stamme fra programtillegget \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6381,9 +7035,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Skal programtillegget fjernes?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6393,5 +7047,5 @@ "lese programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6400,19 +7054,19 @@ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informasjon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "ingen beskrivelse tilgjengelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Flere detaljer" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6421,13 +7075,13 @@ msgstr[1] "Last ned info om programtillegg fra {0} servere" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Fant ikke info om programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Alle installerte programtillegg er siste versjon." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6440,9 +7094,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Last ned programtillegg som mangler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6455,10 +7109,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Last ned Programtillegg" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6481,41 +7131,14 @@ msgstr "ukjent" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versjon {1} {2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Programtillegg inkludert i JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Programtillegg finnes allerede" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Slett og last ned" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Feil ved sletting av programtillegg: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6672,9 +7295,4 @@ msgstr "Oppgi en beskrivelse av sporloggen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Egenskaper" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6846,4 +7464,9 @@ 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 +#, 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 @@ -7076,6 +7699,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Feil ved lasting av fil" @@ -7413,37 +8036,42 @@ "Velg ett og prøv på nytt" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Blank ut lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS lag ({0}), {1} kartutsnitt er lastet" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Er ikke vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Raster midtpunkt: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Er vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Kommune avgrensing: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7452,16 +8080,21 @@ msgstr "les inn WMS lag fra fil" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7472,9 +8105,9 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Feil i mellomlager format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7482,5 +8115,5 @@ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Feil Lambert sone på mellomlager" @@ -7521,7 +8154,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Splitt linje" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7955,7 +8587,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "vann" @@ -8347,16 +8979,21 @@ msgstr "Ukendt status for feilrapport" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Åpne synlige..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Ukjent filtype {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8447,5 +9084,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8472,25 +9109,25 @@ msgstr "Åpne liste over Noder i planlagt Rute" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Legg til lag for ruteplanlegger" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Betingelser" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Korteste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Raskeste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Reverser Rute" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Slett rute" @@ -8665,11 +9302,11 @@ msgstr "avslutt" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Rediger egenskaper" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Start dialog for egenskaper" @@ -8679,8 +9316,4 @@ msgstr "JOSM tilleggsprogram for Egenskaper" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(ingen)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8691,5 +9324,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8698,5 +9331,5 @@ msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8718,8 +9351,14 @@ msgstr "Filter" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Slett" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9625,7 +10264,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "bygning" @@ -9639,5 +10278,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "område" @@ -9728,4 +10367,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9824,36 +10479,36 @@ "Dette resulterer i feil koordinater." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatisk nedlasting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 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:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alpha channel" @@ -9867,51 +10522,51 @@ msgstr "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Rediger liste over WMS servere som vises i WMS programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Meny Navn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Kopier Standard" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Velg raden du vil kopiere." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Overlap tiles" msgstr "Overlapp kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "% of lat:" msgstr "% av bredden:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% av lengden:" @@ -10010,11 +10665,7 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10185,6 +10836,11 @@ "vanlige. Stavekontroll for egenskapsnavn." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10277,5 +10933,5 @@ #: build/trans_presets.java:1525 build/trans_presets.java:2995 msgid "Reference" -msgstr "Oppslagsverk" +msgstr "Vei Nr" #. item "Streets/Motorway" text "Name" @@ -10630,5 +11286,5 @@ #: build/trans_presets.java:84 msgid "Trunk" -msgstr "Stamvei" +msgstr "Motortrafikkvei" #. item @@ -10637,5 +11293,5 @@ #: build/trans_presets.java:87 msgid "Edit Trunk" -msgstr "Rediger Stamvei" +msgstr "Rediger Motortrafikkvei" #. item "Streets/Trunk" check "Oneway" @@ -10652,5 +11308,5 @@ #: build/trans_presets.java:104 msgid "Trunk Link" -msgstr "Stamvei tilførselvei" +msgstr "Motortrafikkvei tilførselvei" #. item @@ -10659,5 +11315,5 @@ #: build/trans_presets.java:107 msgid "Edit Trunk Link" -msgstr "Rediger Stamvei tilførselvei" +msgstr "Rediger Motortrafikkvei tilførselvei" #. item "Streets/Trunk Link" check "Embankment" @@ -11003,5 +11659,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privat" @@ -11049,5 +11705,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "destinasjon" @@ -11084,5 +11740,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permissive" @@ -11314,6 +11970,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "motorway" @@ -11339,6 +11995,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "trunk" @@ -11364,6 +12020,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "riksvei" @@ -11389,6 +12045,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "fylkesvei" @@ -11402,5 +12058,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "kommunevei" @@ -11418,5 +12074,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "boligvei" @@ -11434,5 +12090,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "adkomstvei" @@ -11459,6 +12115,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "veiarbeid" @@ -11508,5 +12164,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rundkjøring" @@ -12485,5 +13141,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "Myrområde" @@ -12608,5 +13264,5 @@ #: build/trans_presets.java:1175 msgid "Waterway Point" -msgstr "Sjømerke" +msgstr "Punkt i vann" #. group "Waterway Point" @@ -12824,5 +13480,5 @@ #: build/trans_presets.java:1269 msgid "Bus Guideway" -msgstr "Bus Guideway" +msgstr "Bussholdeplass" #. item @@ -12830,5 +13486,5 @@ #: build/trans_presets.java:1271 msgid "Edit Bus Guideway" -msgstr "Edit Bus Guideway" +msgstr "Rediger Bussholdeplass" #. item "Railway/Bus Guideway" text "Width (meters)" @@ -14207,27 +14863,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -16492,20 +17148,20 @@ #: build/trans_presets.java:2718 msgid "Administrative" -msgstr "Administrativ" +msgstr "Fylkesgrense" #. item #: build/trans_presets.java:2719 msgid "Edit Administrative Boundary" -msgstr "Rediger grense Forvaltningsområde" +msgstr "Rediger Fylkesgrense" #. item "Boundaries/Administrative" text "Name" #: build/trans_presets.java:2724 msgid "Civil" -msgstr "Sivil" +msgstr "Kommunegrense" #. item #: build/trans_presets.java:2725 msgid "Edit Civil Boundary" -msgstr "Rediger Civil Grenser (privatrettslig?)" +msgstr "Rediger Kommunegrense" #. item "Boundaries/Civil" text "Name" @@ -17065,8 +17721,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "sykkel" @@ -17127,6 +17783,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17137,8 +17791,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "fotgjenger" @@ -17164,5 +17818,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "T-bane" @@ -17247,4 +17901,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17259,8 +17914,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17280,5 +17937,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17368,7 +18025,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "bro" @@ -17632,15 +18289,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "uønsket" @@ -17682,5 +18339,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "hest" @@ -17890,11 +18547,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "hinder" @@ -17932,6 +18589,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "gate" @@ -17987,7 +18644,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "Riksvei-spor" @@ -18043,8 +18700,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "jernbane" @@ -18065,5 +18722,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "service" @@ -18077,5 +18734,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "sperrekjegle" @@ -18096,5 +18753,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "vendesirkel" @@ -18109,5 +18766,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "treffpunkt_for_nødhjelp" @@ -18122,5 +18779,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "elvebredd" @@ -18134,5 +18791,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "elv" @@ -18146,5 +18803,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "tørrdokk" @@ -18172,5 +18829,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "akvadukt" @@ -18338,13 +18995,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "menneskeskapt" @@ -18406,7 +19063,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "jernbanepunkt" @@ -18429,10 +19086,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "annen_bane" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "jernbanebro" @@ -18462,6 +19119,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "nedlagt_bane" @@ -18506,6 +19163,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "aeroway" @@ -18519,5 +19176,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "stasjon" @@ -18539,5 +19196,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -18551,5 +19208,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "aeroway_light" @@ -18597,7 +19254,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "aerialway" @@ -18614,5 +19271,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "nedfart_enkel" @@ -18627,5 +19284,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "nedfart_middels" @@ -18640,5 +19297,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "nedfart_avansert" @@ -18653,5 +19310,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "nedfart_ekspert" @@ -18666,5 +19323,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "nedfart_friløp" @@ -18679,5 +19336,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "nedfart_nybegynner" @@ -18782,10 +19439,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "kraft" @@ -18798,8 +19455,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "brygge" @@ -18813,5 +19468,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "rørgate" @@ -18939,12 +19594,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "fritid" @@ -18958,5 +19613,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "marina" @@ -19028,8 +19683,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "bekvemlighet" @@ -19131,10 +19786,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "vei_bekvemligheter" @@ -19520,22 +20175,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "bekvemlighet_light" @@ -19567,6 +20222,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "light_vann" @@ -19627,8 +20282,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "helse" @@ -19981,26 +20636,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "butikk" @@ -20072,8 +20727,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotell" @@ -20223,9 +20878,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turisme" @@ -20297,8 +20952,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historisk" @@ -20369,8 +21024,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "grønn" @@ -20384,5 +21039,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "steinbrudd" @@ -20396,5 +21051,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "avfallsdeponi" @@ -20416,5 +21071,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "vannmagasin" @@ -20428,5 +21083,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "skog" @@ -20440,5 +21095,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "gårdstun" @@ -20461,5 +21116,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "butikker" @@ -20473,5 +21128,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industri" @@ -20485,5 +21140,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "rivningsområde" @@ -20497,5 +21152,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "byggeområde" @@ -20509,5 +21164,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "jernbanegrunn" @@ -20564,7 +21219,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "millitært" @@ -20578,5 +21233,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "gravlund" @@ -20589,5 +21244,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "fjelltopp" @@ -20602,5 +21257,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "isbre" @@ -20614,5 +21269,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulkan" @@ -20667,8 +21322,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "natur" @@ -20682,5 +21337,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "krattskog" @@ -20694,5 +21349,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "beiteområde" @@ -20706,5 +21361,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "skogsområde" @@ -20718,5 +21373,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "søle" @@ -20730,5 +21385,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "strand" @@ -20806,8 +21461,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "rute" @@ -20855,7 +21510,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "grense" @@ -20997,10 +21652,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "sted" @@ -21048,6 +21703,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adresse" @@ -21234,5 +21889,5 @@ #: build/trans_validator.java:59 build/trans_validator.java:60 msgid "maxspeed used for footway" -msgstr "max hastighet er brukt på gangvei" +msgstr "fartsgrense er brukt på gangvei" #. way : I : highway == steps && maxspeed == * @@ -21278,10 +21933,10 @@ msgstr "LandSat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21329,4 +21984,26 @@ msgstr "Gater NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." + +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21335,2 +22012,41 @@ #~ "Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og " #~ "flytt musa. Velg: Klik" + +#~ 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 "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " +#~ "automatisk." + +#~ 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 "Delete and Download" +#~ msgstr "Slett og last ned" + +#~ 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." Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 15801) +++ /applications/editors/josm/i18n/po/nl.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-18 16:23+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-31 17:26+0000\n" +"Last-Translator: mvexel \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,17 +25,16 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt." - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -43,53 +42,55 @@ "naar de server." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Niet-opgeslagen wijzigingen" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Sla op en verlaat JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Negeer veranderingen en verlaat JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -97,5 +98,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -104,10 +105,10 @@ msgstr "Annuleren" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -191,5 +192,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Plugins" @@ -256,15 +257,15 @@ msgstr "Lengtegraad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Knopen uitlijnen in een cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "De geselecteerde knopen in een cirkel plaatsen." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -273,8 +274,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -295,9 +297,9 @@ msgstr "Gereedschap: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Sommige knopen zitten (bijna) op de lijn" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Selecteer minstens vier knopen." @@ -332,5 +334,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflict" @@ -476,5 +478,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -485,7 +487,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Verwijderen" @@ -495,14 +497,15 @@ msgstr "Geselecteerde objecten verwijderen." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Overschrijven?" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Bestand bestaat al. Overschrijven?" @@ -530,9 +533,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -570,16 +573,4 @@ msgstr "De applicatie afsluiten." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM Server bestanden" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX-bestanden" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183-bestanden" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -653,12 +644,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -666,5 +657,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Fout" @@ -685,5 +676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -800,4 +791,18 @@ msgstr "{0} knopen samenvoegen" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -854,67 +859,25 @@ msgstr "Onbenoemd" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Openen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Een bestand openen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fout tijdens ontleden {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Onbekende bestandsextentie: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markers van {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Geïmporteerde coördinaten: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Misvormde zinnen: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Controlegetalfouten: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Onbekende zinnen: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Nulcoördinaten: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA-import gelukt" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Importeren NMEA is mislukt!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -988,5 +951,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Plakken" @@ -1015,5 +978,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Voorkeuren" @@ -1059,14 +1022,19 @@ msgstr "Wegen omkeren" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Huidige gegevens opslaan." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1076,26 +1044,26 @@ "dit als fout a.u.b." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Leeg document" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Het document bevat geen gegevens." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Toch opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflicten" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1105,32 +1073,36 @@ "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Conflicten verwerpen en opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "OSM-bestand opslaan" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "GPX-bestand opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "OSM-bestand opslaan" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Kan van bestand geen backup maken." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Onbekende bestandsextentie." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Het opslaan is mislukt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Het herstellen van backupbestand is mislukt." @@ -1272,55 +1244,55 @@ msgstr "De algemene instelling \"{0}\" in-/uitschakelen" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Wegen losmaken" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dubbele knopen die door meerdere wegen worden gebruikt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Selecteer één van beide:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Een getagde knoop, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* een weg heeft één of meer knopen die gebruikt worden door meer dan één " +"weg, of" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* een weg heeft één of meer knopen die gebruikt worden door meer dan één " -"weg, of" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1328,5 +1300,5 @@ "één weg." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1340,9 +1312,9 @@ "geselecteerd worden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Ongebonden knoop" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1350,5 +1322,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1411,50 +1383,50 @@ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Naar OSM uploaden..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Upload alle aanpassingen naar de OSM-server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Objecten om toe te voegen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Objecten om te bewerken:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Objecten om aan te verwijderen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Deze veranderingen uploaden?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Aanpassingen uploaden" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Geen aanpassingen aanwezig om te uploaden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1660,14 +1632,14 @@ msgstr "Knoop in weg voegen en verbinden" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Nieuwe node maken." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Selecteer de node onder de cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1676,14 +1648,14 @@ msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Start een nieuwe weg vanaf de node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Weg voortzetten vanaf laatste knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Tekenen beëindigen" @@ -1703,5 +1675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren." @@ -1714,5 +1686,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "De muisknop loslaten om het roteren te stoppen." @@ -1749,5 +1721,5 @@ msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1756,5 +1728,5 @@ "met dichtstbijzijnde knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1781,16 +1753,16 @@ "omlaag, rechts; verplaats met rechter knop" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1798,146 +1770,156 @@ msgstr "Geen gegevens geladen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "Hoofdlettergevoelig" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:Lange - geen 'Lang' in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 +#: ../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:87 +#: ../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:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1955,15 +1937,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Ontbrekende argumenten voor OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Ontbrekend argument voor NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1998,7 +2010,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Toevoegen" @@ -2038,4 +2050,8 @@ msgstr "Stel in {0}={1} voor {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2043,65 +2059,10 @@ msgstr "Los {0} conflicten in {1} objecten op" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Conflicterende relatie" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Uit relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Verplaatsen" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2113,170 +2074,19 @@ msgstr[1] "knopen" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "RemoveRelationMember" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Roteren" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Volgorde" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Toepassen?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Geselecteerde wijzigingen toepassen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Wijzigingen niet toepassen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Eigenschappen van " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Rollen in relaties verwijzen naar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatische tagcorrectie" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Configuratiebestand is verminkt in regels {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan voorkeurenmap niet openen: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "verschillend" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "verwijderd" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "Waar" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "onwaar" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "positie" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Decimale graden" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Graden minuten seconden" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "Z" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "W" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "O" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "onvolledig" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Fout: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Waarschuwing: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "weg" +msgstr[1] "wegen" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2288,4 +2098,265 @@ msgstr[1] "relaties" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "{1} {0} verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "{0} {1} verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Conflicterende relatie" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Verplaatsen" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "RemoveRelationMember" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Roteren" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Volgorde" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Toepassen?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "verschillend" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "verwijderd" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "Waar" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "onwaar" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "positie" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Decimale graden" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Graden minuten seconden" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "Z" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "W" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "O" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "onvolledig" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Fout: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Waarschuwing: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2320,138 +2391,129 @@ msgstr[1] "{0} knopen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Oppervlak van weg is niet gesloten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygone weg \"{0}\" is niet gesloten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Relatie bevat leeg lid." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Lid \"{0}\" in relatie wissen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Weg \"{0}\" met minder dan twee punten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Meer dan een \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Meer dan een \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Meer dan éé \"via\" gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Onbekende rol \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Onbekend lidtype voor \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Geen \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Geen \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Geen \"via\"-knoop of -weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Stijl voor beperking {0} is niet gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Niet-weg \"{0}\" in multipolygoon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Geen buitenweg voor multipolygoon \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Binnenweg \"{0}\" is uitwendig." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "niet-getagd" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "weg" -msgstr[1] "wegen" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2473,5 +2535,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2559,4 +2621,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2571,4 +2634,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2783,26 +2847,26 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2811,21 +2875,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Draadmodelweergave" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Draadmodelweergave in- of uitschakelen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Volledig scherm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Geluid" @@ -2938,4 +3002,493 @@ msgstr "Initialiseren" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Tags" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Leden" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rol" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2949,5 +3502,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2980,9 +3533,9 @@ "in de bovenstaande lijst." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2990,25 +3543,69 @@ "lijst openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Samenvoegconflicten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Conflict oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Conflicten: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Waarschuwing" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3170,10 +3767,4 @@ msgid "Member Of" msgstr "Lid van" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rol" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3359,8 +3950,4 @@ msgstr "Tags (lege waarde verwijdert de tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Leden" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3394,11 +3981,4 @@ msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3453,5 +4033,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3476,5 +4056,5 @@ msgstr "ja" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3501,24 +4081,24 @@ msgstr "nee" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Leden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relatie-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Er zijn conflicten tijdens het importeren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Ontleden van de serverreactie is mislukt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Kan niet met server verbinden." @@ -3775,10 +4355,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Waarschuwing" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3817,5 +4391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3853,53 +4427,53 @@ msgstr "Ingevoerde tijd kon niet worden ontleed." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "GPS-punt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Lijntekening aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Algemene instellingen gebruiken." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Geen lijnen tussen punten in deze laag tekenen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Lijntekenopties selecteren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Kleur aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3907,6 +4481,6 @@ msgstr "Standaard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3914,31 +4488,31 @@ msgstr "Kies een kleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Markers van benoemde punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Benoemde trackpunten van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Geluid importeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave-geluidsbestanden (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Geluidsmarkers van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Afbeeldingen importeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3947,5 +4521,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3954,5 +4528,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3961,28 +4535,28 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Naam: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Beschrijving: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Tijdsperiode: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Lengte: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Naar gegevenslaag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3993,11 +4567,11 @@ "zijn.
Als je sporen wilt uploaden, kijk dan hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4007,29 +4581,29 @@ msgstr "Omgezet van: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Alles downloaden binnen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4040,9 +4614,9 @@ "verder
gaan?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4052,5 +4626,5 @@ "de track zijn overgeslagen of naar de start verplaatst." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4069,24 +4643,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} verwijderd.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4122,5 +4696,5 @@ msgstr[1] "Punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4129,5 +4703,5 @@ msgstr[1] "Een track met {0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4136,5 +4710,5 @@ msgstr[1] "{0} bestaat uit {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4273,5 +4847,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Selecteer een rij om te verwijderen." @@ -5638,5 +6212,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Update" @@ -5648,7 +6222,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "site-josm.xml of Wiki-paginas toevoegen." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5656,4 +6229,8 @@ msgid "Please select an entry." msgstr "Selecteer een invoer." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6044,5 +6621,5 @@ msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6053,15 +6630,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6071,18 +6648,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -6120,8 +6697,53 @@ msgstr "Gegevens voorbereiden..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX-bestanden" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markers van {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183-bestanden" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Geïmporteerde coördinaten: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Misvormde zinnen: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Controlegetalfouten: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Onbekende zinnen: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Nulcoördinaten: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA-import gelukt" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Importeren NMEA is mislukt!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6178,4 +6800,13 @@ msgid "Unknown host" msgstr "Onbekende host" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6204,8 +6835,16 @@ msgstr "Afbreken..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM Server bestanden" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6249,7 +6888,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Lid \"{0}\" in relatie wissen." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6295,5 +6934,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6316,15 +6955,20 @@ "nog eens." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Plugins bijwerken" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Plugins downloaden" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6337,22 +6981,32 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b." -msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Kan plugin niet downloaden: {0} van {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -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 "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6370,25 +7024,25 @@ "noodzakelijk." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Plugin vereist JOSM-update: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin niet gevonden: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6398,21 +7052,21 @@ "via de configuratieoptie 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Plugin uitschakelen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6422,5 +7076,5 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6430,10 +7084,10 @@ "\"-plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6442,9 +7096,9 @@ "fout rapporteert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Moet de plugin worden uitgeschakeld?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6454,5 +7108,5 @@ "uit de applicatie te halen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6462,19 +7116,19 @@ "over dit probleem." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informatie" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "geen omschrijving beschikbaar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6483,13 +7137,13 @@ msgstr[1] "Plugin-informatie van {0} sites downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Geen plugin-informatie gevonden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Alle geïnstalleerde plugins zijn bijgewerkt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6502,9 +7156,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Ontbrekende plugins downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6517,10 +7171,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Plugins downloaden" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6543,41 +7193,14 @@ msgstr "onbekend" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: versie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin gebundeld met JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Plugin bestaat al" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Verwijder en download" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Fout tijdens verwijderen plugin-bestand: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6728,9 +7351,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Tags" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6902,4 +7520,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fout tijdens ontleden {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7134,6 +7757,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Laden bestand is mislukt" @@ -7477,37 +8100,42 @@ "Selecteer er eerst één en probeer dan opnieuw" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Lege laag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-laag ({0}), {1} tegel(s) geladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Is niet gevectoriseerd." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Middelpunt raster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Is gevectoriseerd." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Omvattende reschthoek gemeente: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7516,16 +8144,21 @@ msgstr "WMS-laag uit bestand laden" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7536,9 +8169,9 @@ "Maak een nieuwe aan." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Fout in bufferstructuur" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7546,5 +8179,5 @@ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Fout in buffer Lambert-zone" @@ -7585,7 +8218,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Weg splitsen" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -8019,7 +8651,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "water" @@ -8412,16 +9044,21 @@ msgstr "Onderwerpstatus onbekend" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Zichtbare openen." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Onbekende bestandsextentie: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8514,5 +9151,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8539,25 +9176,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8730,11 +9367,11 @@ msgstr "einde" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8744,8 +9381,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8756,5 +9389,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8763,5 +9396,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8783,7 +9416,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9703,7 +10342,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "gebouw" @@ -9717,5 +10356,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "gebied" @@ -9810,4 +10449,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9911,19 +10566,19 @@ "Dat kan tot foutieve coördinaten leiden." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatisch downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9931,17 +10586,17 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9955,52 +10610,52 @@ msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Voorkeuren WMS-plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menunaam" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Menunaam (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS-URL (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Een menunaam en WMS-URL invoeren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Standaardwaarde kopiëren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "De rij om te kopiëren selecteren." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -10090,7 +10745,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10240,6 +10894,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11057,5 +11716,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privé" @@ -11103,5 +11762,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "bestemming" @@ -11138,5 +11797,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "toestemming" @@ -11368,6 +12027,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "Autosnelweg" @@ -11393,6 +12052,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "autoweg" @@ -11418,6 +12077,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "provinciale weg" @@ -11443,6 +12102,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "N-weg" @@ -11456,5 +12115,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "weg buiten bebouwde kom" @@ -11472,5 +12131,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "woongebied" @@ -11488,5 +12147,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "toegangsweg" @@ -11513,6 +12172,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "werkzaamheden" @@ -11562,5 +12221,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rotonde" @@ -12539,5 +13198,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "moeras" @@ -13420,5 +14079,5 @@ #: build/trans_presets.java:1588 build/trans_presets.java:1595 msgid "Cuisine" -msgstr "Franse keuken" +msgstr "Keuken" #. item "Food+Drinks/Restaurant" combo "Cuisine" @@ -14261,27 +14920,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -17119,8 +17778,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "fiets" @@ -17181,6 +17840,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17191,8 +17848,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "voet" @@ -17218,5 +17875,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17301,4 +17958,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17313,8 +17971,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17334,5 +17994,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standaard" @@ -17422,7 +18082,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "brug" @@ -17686,15 +18346,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "vervallen" @@ -17736,5 +18396,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "paard" @@ -17944,11 +18604,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17986,6 +18646,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "straat" @@ -18041,7 +18701,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "snelwegroute" @@ -18097,8 +18757,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "spoor" @@ -18119,5 +18779,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -18131,5 +18791,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -18150,5 +18810,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "Omkeermogelijkheid" @@ -18163,5 +18823,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18176,5 +18836,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "rivierbank" @@ -18188,5 +18848,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "stroom" @@ -18200,5 +18860,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "dok" @@ -18226,5 +18886,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "aquaduct" @@ -18392,13 +19052,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "kunstmatig" @@ -18460,7 +19120,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "spoorwegpunt" @@ -18483,10 +19143,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "ander spoor" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "spoorovergang" @@ -18516,6 +19176,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "oud spoor" @@ -18560,6 +19220,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "luchtverbinding" @@ -18573,5 +19233,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18593,5 +19253,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "luchtverbinding_donker" @@ -18605,5 +19265,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "luchtverbinding_licht" @@ -18651,7 +19311,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "kabelbaan" @@ -18668,5 +19328,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "piste_eenvoudig" @@ -18681,5 +19341,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "piste_middelmatig" @@ -18694,5 +19354,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "piste_gevorderden" @@ -18707,5 +19367,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18720,5 +19380,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "piste_vrijekuur" @@ -18733,5 +19393,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "piste_beginner" @@ -18836,10 +19496,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "kracht" @@ -18852,8 +19512,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "pijler" @@ -18867,5 +19525,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "pijplijn" @@ -18993,12 +19651,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "vrije tijd" @@ -19012,5 +19670,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "jachthaven" @@ -19082,8 +19740,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "voorziening" @@ -19185,10 +19843,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "voorziening_verkeer" @@ -19574,22 +20232,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "voorziening_licht" @@ -19621,6 +20279,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "licht_water" @@ -19681,8 +20339,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "gezondheid" @@ -20035,26 +20693,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "winkel" @@ -20126,8 +20784,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20277,9 +20935,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "toerisme" @@ -20351,8 +21009,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historisch" @@ -20423,8 +21081,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "groen" @@ -20438,5 +21096,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "mijnbouw" @@ -20450,5 +21108,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "vuilstortplaats" @@ -20470,5 +21128,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "estuarium" @@ -20482,5 +21140,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "bosbouw" @@ -20494,5 +21152,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "landbouwgrond" @@ -20515,5 +21173,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "winkelcentrum" @@ -20527,5 +21185,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industrieel" @@ -20539,5 +21197,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "braakliggend gebied" @@ -20551,5 +21209,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "ontwikkelingsgebied" @@ -20563,5 +21221,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "Rangeerterrein" @@ -20618,7 +21276,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "militair gebruik" @@ -20632,5 +21290,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "begraafplaats" @@ -20643,5 +21301,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "berg of -heuveltop" @@ -20656,5 +21314,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "gletsjer" @@ -20668,5 +21326,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulkaan" @@ -20721,8 +21379,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "Natuurlijk" @@ -20736,5 +21394,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "ruig land" @@ -20748,5 +21406,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "heide" @@ -20760,5 +21418,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "oerbos" @@ -20772,5 +21430,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "slikgronden" @@ -20784,5 +21442,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "strand" @@ -20860,8 +21518,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "route" @@ -20909,7 +21567,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "grens" @@ -21051,10 +21709,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "plaats" @@ -21102,6 +21760,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adres" @@ -21332,10 +21990,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Map met luchtfoto's openen" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21383,4 +22041,32 @@ msgstr "Straten NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xml of Wiki-paginas toevoegen." + +#~ msgid "Commit comment" +#~ msgstr "Opmerking bevestigen" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b." +#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kan plugin niet downloaden: {0} van {1}" + +#~ msgid "Navigation" +#~ msgstr "Navigatie" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21390,10 +22076,4 @@ #~ "indrukken en muis bewegen. Selecteer" -#~ msgid "Commit comment" -#~ msgstr "Opmerking bevestigen" - -#~ msgid "Navigation" -#~ msgstr "Navigatie" - #~ msgid "Charge" #~ msgstr "Lading" @@ -21405,4 +22085,13 @@ #~ 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 "Drawbridge" #~ msgstr "Kabelbrug" @@ -21414,10 +22103,33 @@ #~ msgstr "Valhek" +#~ 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 "" +#~ "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 "viaduct" #~ msgstr "viaduct" +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt." + #~ msgid "sports" #~ msgstr "Sportartikelen" +#~ msgid "Delete and Download" +#~ msgstr "Verwijder en download" + #~ msgid "Edit Drawbridge" #~ msgstr "Kabelbrug bewerken" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 15801) +++ /applications/editors/josm/i18n/po/pl.po (revision 15802) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" "PO-Revision-Date: 2009-05-18 15:54+0000\n" "Last-Translator: Łukasz Jernaś \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-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,5 +23,5 @@ "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -29,69 +29,70 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Niezapisane zmiany" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Zapisz i wyjdź" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Porzuć i wyjdź" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -99,5 +100,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -106,10 +107,10 @@ msgstr "Anuluj" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -193,5 +194,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Wtyczki" @@ -258,15 +259,15 @@ msgstr "Długość" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Wyrównaj węzły na kole" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -275,8 +276,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -297,9 +299,9 @@ msgstr "Narzędzie: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Niektóre z węzłów są (prawie) w jednej linii" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Wybierz co najmniej cztery węzły." @@ -334,5 +336,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -478,5 +480,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -487,7 +489,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Usuń" @@ -497,14 +499,15 @@ msgstr "Usuwa wybrane obiekty" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Zastąp" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Plik istnieje. Nadpisać?" @@ -534,9 +537,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -574,16 +577,4 @@ msgstr "Kończy pracę z programem." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Pliki serwera OSM" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "Pliki GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "Pliki NMEA-0183" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -657,12 +648,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -670,5 +661,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Błąd" @@ -689,5 +680,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -805,4 +796,18 @@ msgstr "Scal {0} węzłów" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -859,67 +864,25 @@ msgstr "bez nazwy" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Otwórz..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Otwiera plik." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Błąd podczas przetwarzania {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Nieznane rozszerzenie pliku: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Znaczniki z {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Liczba wczytanych współrzędnych: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Nieprawidłowe sekwencje: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Błędy sum kontrolnych: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Nieznane sewkencje: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Zerowe współrzędne: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Import NMEA zakończony powodzeniem" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Import NMEA zakończony niepowodzeniem!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -996,5 +959,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Wklej" @@ -1023,5 +986,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Ustawienia" @@ -1067,14 +1030,19 @@ msgstr "Odwróć kierunek dróg" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Zapisz" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Zapisuje bieżące dane." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1084,26 +1052,26 @@ "conditions for no layer\"." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Pusty dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokument nie zawiera żadnych danych." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Zapisz pomimo tego" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1113,32 +1081,36 @@ "odrzucone. Czy kontunuować?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Odrzuć konflikty i zapisz" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Zapisz plik OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Zapisz plik GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Zapisz plik OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Nie można utworzyć kopii zapasowej pliku." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Nieznane rozszerzenie pliku." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Wystąpił błąd podczas zapisywania." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej." @@ -1274,42 +1246,42 @@ msgstr "Przełącza ustawienie globalne \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozdziel drogi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Powiela węzły które używane są przez różne drogi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Wybierz przynajmniej:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Jeden węzęł z tagami lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1317,13 +1289,13 @@ "tych dróg lub" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Jedną drogę która ma jeden lub więcej węzłów użyty przez więcej niż jedną " +"drogę, lub" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Jedną drogę która ma jeden lub więcej węzłów użyty przez więcej niż jedną " -"drogę, lub" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1331,5 +1303,5 @@ "niż jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1339,9 +1311,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Rozdzielenie węzła" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1349,5 +1321,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1407,50 +1379,50 @@ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Wyślij do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Wysyła wszystkie zmiany na serwer OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Obiekty do dodania:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Obiekty do zmiany:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Obiekty do usunięcia:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Czy wysłać te zmiany?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Wyślij zmiany" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Brak zmian do wysłania." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1656,14 +1628,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Utwórz nowy węzeł." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Zaznacz węzeł pod kursorem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1672,14 +1644,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Zakończ rysowanie." @@ -1699,5 +1671,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1708,5 +1680,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." @@ -1741,5 +1713,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1748,5 +1720,5 @@ "najbliższym węzłem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1771,16 +1743,16 @@ "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1788,54 +1760,64 @@ msgstr "Nie wczytano żadnych danych." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1843,92 +1825,92 @@ "type: - rodzaj obiektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1942,15 +1924,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Brak argumentów dla operator lub." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Brak argumentu dla operatora nie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1985,7 +1997,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Dodaj" @@ -2026,4 +2038,8 @@ msgstr "Ustaw {0}={1} dla {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2031,58 +2047,10 @@ msgstr "Rozwiąż {0} konfliktów w {1} obiektach" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Usuń {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Usuń {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Sprzeczne relacje" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Usuń z relacji" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Przenieś" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2095,169 +2063,20 @@ msgstr[2] "węzłów" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Obrót" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekwencja" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Zastosować?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Zastosuj wybrane zmiany" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Porzuć zmiany" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Właściwości " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatyczna korekcja tagów" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "różne" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "usunięto" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "prawda" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "fałsz" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "pozycja" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Stopnie dziesiętne" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Stopnie minuty sekundy" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "W" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "niekompletne" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Błąd: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Uwaga: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "droga" +msgstr[1] "drogi" +msgstr[2] "dróg" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2270,4 +2089,257 @@ msgstr[2] "relacji" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Usuń {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Usuń {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Sprzeczne relacje" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Przenieś" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Obrót" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekwencja" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Zastosować?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "różne" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "usunięto" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "prawda" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "fałsz" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "pozycja" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Stopnie dziesiętne" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Stopnie minuty sekundy" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "W" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "niekompletne" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Błąd: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Uwaga: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2304,139 +2376,129 @@ msgstr[2] "{0} węzłów" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Nieznana rola \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "nieotagowany" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "droga" -msgstr[1] "drogi" -msgstr[2] "dróg" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2458,5 +2520,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2532,4 +2594,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2544,4 +2607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2746,26 +2810,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2774,21 +2838,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Przełącza widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Pełny ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Przełącza widok na pełen ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Dźwięk" @@ -2898,4 +2962,493 @@ msgstr "Inicjalizacja" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Etykiety" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Członkowie" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Usuń" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rola" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2909,5 +3462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2938,33 +3491,77 @@ msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Rozwiąż" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Rozwiązywanie konflików." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Rozwiąż konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Rozwiąż konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Uwaga" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3128,10 +3725,4 @@ msgid "Member Of" msgstr "Członek" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rola" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3318,8 +3909,4 @@ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Członkowie" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3353,11 +3940,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Usuń" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3412,5 +3992,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3435,5 +4015,5 @@ msgstr "tak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3460,24 +4040,24 @@ msgstr "nie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Członkowie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Edytor relacji: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Wystąpiły konfikty podczas importowania." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Błąd podczas parsowania odpowiedzi serwera." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Nie można połączyć się z serwerem." @@ -3733,10 +4313,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Uwaga" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3776,5 +4350,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3812,53 +4386,53 @@ msgstr "Podany czas nie został rozpoznany." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "punkt GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Dostosuj rysowanie linii" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Użyj ustawień globalnych." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Wybierz opcje rysowania linii" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Dostosuj kolor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3866,6 +4440,6 @@ msgstr "Domyślny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3873,31 +4447,31 @@ msgstr "Wybierz kolor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Znaczniki nazwanych punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Nazwane punkty GPS z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importuj dźwięk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Pliki audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Markery audio z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importuj obrazki" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3907,5 +4481,5 @@ msgstr[2] "{0} śladów, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3915,5 +4489,5 @@ msgstr[2] "{0} tras, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3923,28 +4497,28 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Nazwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Opis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Okres czasu: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Długość: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Przekształć w warstwę danych" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3955,11 +4529,11 @@ "za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3969,29 +4543,29 @@ msgstr "Przekonwertowany z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metrów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4002,5 +4576,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -4008,5 +4582,5 @@ "danymi dźwiękowymi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4014,5 +4588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4029,24 +4603,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} usuniętych.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4084,5 +4658,5 @@ msgstr[2] "punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4092,5 +4666,5 @@ msgstr[2] "trasa z {0} punktami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4100,5 +4674,5 @@ msgstr[2] "{0} składa się z {1} ścieżek" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4236,5 +4810,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Proszę wybrać wiersz do usunięcia" @@ -5576,5 +6150,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Aktualizuj" @@ -5586,6 +6160,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5593,4 +6166,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5953,5 +6530,5 @@ msgstr "Nieznany typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5962,15 +6539,15 @@ msgstr "Nie można odczytać źródła szablonów: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5981,18 +6558,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Zmień właściwości" @@ -6031,8 +6608,53 @@ msgstr "Przygotowywanie danych..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "Pliki GPX" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Znaczniki z {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Błąd parsowania: błędna struktura dokumentu gpx" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "Pliki NMEA-0183" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Liczba wczytanych współrzędnych: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Nieprawidłowe sekwencje: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Błędy sum kontrolnych: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Nieznane sewkencje: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Zerowe współrzędne: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Import NMEA zakończony powodzeniem" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Import NMEA zakończony niepowodzeniem!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6089,4 +6711,13 @@ msgid "Unknown host" msgstr "Nieznany adres" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6115,8 +6746,16 @@ msgstr "Przerywanie..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "Pliki serwera OSM" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6206,5 +6845,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6228,15 +6867,20 @@ "chwili." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Aktualizuj wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Pobierz wtyczki" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6248,25 +6892,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Nie można pobrać wtyczki {0} z {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać " -"automatycznie." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6284,25 +6935,25 @@ "potrzebna." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Plugin wymaga aktualizacji JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Nie znaleziono wtyczki: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6312,21 +6963,21 @@ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Zablokuj wtyczkę" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6336,5 +6987,5 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6344,10 +6995,10 @@ "\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6356,9 +7007,9 @@ "błędu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Czy ta wtyczka ma zostać zablokowana?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6368,5 +7019,5 @@ "wyładować wtyczkę." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6376,19 +7027,19 @@ "autorom JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informacje" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "brak opisu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6398,13 +7049,13 @@ msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Nie znaleziono informacji o wtyczce." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Wszystkie zainstalowane wtyczki są aktualne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6417,9 +7068,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Pobierz brakujące wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6432,10 +7083,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Pobierz wtyczki" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6458,41 +7105,14 @@ msgstr "nieznany" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Wersja {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Wtyczka dostarczana wraz z JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Wtyczka już istnieje" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję kasując " -"istniejące archiwum?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Usuń i pobierz" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Błąd podczas usuwania wtyczki: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6644,9 +7264,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Etykiety" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6818,4 +7433,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Błąd podczas przetwarzania {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7039,6 +7659,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" @@ -7358,36 +7978,41 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Pusta warstwa" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" msgstr "" @@ -7397,16 +8022,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Błędny format pliku" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7415,14 +8045,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7463,7 +8093,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Rozdziel drogę" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7894,7 +8523,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "woda" @@ -8274,16 +8903,21 @@ msgstr "Nieznany stan problemu" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Nieznane rozszerzenie pliku: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8372,5 +9006,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8397,25 +9031,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8588,11 +9222,11 @@ msgstr "koniec" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8602,8 +9236,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8614,5 +9244,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8621,5 +9251,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8641,7 +9271,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9534,7 +10170,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "budynek" @@ -9548,5 +10184,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "obszar" @@ -9637,4 +10273,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9712,36 +10364,36 @@ "Może to spowodować powstanie błędnych współrzędnych." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Zmiana rozdzielczości" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9755,51 +10407,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Ustawienia wtyczki WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nazwa w menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Adres serwera WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "URL WMS (domyślny)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9885,7 +10537,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10035,6 +10686,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10852,5 +11508,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "droga prywatna" @@ -10898,5 +11554,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "dojazd do posesji" @@ -10933,5 +11589,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "dopuszczalny" @@ -11163,6 +11819,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "autostrada" @@ -11188,6 +11844,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "droga ekspresowa" @@ -11213,6 +11869,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "droga krajowa" @@ -11238,6 +11894,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "droga wojewódzka" @@ -11251,5 +11907,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "droga powiatowa" @@ -11267,5 +11923,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "droga lokalna" @@ -11283,5 +11939,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "droga serwisowa" @@ -11308,6 +11964,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "w budowie" @@ -11357,5 +12013,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rondo" @@ -12334,5 +12990,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "marsze" @@ -14056,27 +14712,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -16914,8 +17570,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "" @@ -16976,6 +17632,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16986,8 +17640,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -17013,5 +17667,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17096,4 +17750,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17108,8 +17763,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17129,5 +17786,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17217,7 +17874,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "most" @@ -17481,15 +18138,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "przestarzały" @@ -17531,5 +18188,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17739,11 +18396,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17781,6 +18438,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "ulica" @@ -17836,7 +18493,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17892,8 +18549,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17914,5 +18571,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17926,5 +18583,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17945,5 +18602,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17958,5 +18615,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17971,5 +18628,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "" @@ -17983,5 +18640,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "strumień" @@ -17995,5 +18652,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "Dok" @@ -18021,5 +18678,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "akwedukt" @@ -18187,13 +18844,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18255,7 +18912,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18278,10 +18935,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18311,6 +18968,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18355,6 +19012,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18368,5 +19025,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "Terminal" @@ -18388,5 +19045,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18400,5 +19057,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18446,7 +19103,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18463,5 +19120,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18476,5 +19133,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18489,5 +19146,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18502,5 +19159,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18515,5 +19172,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18528,5 +19185,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18631,10 +19288,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18647,8 +19304,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "" @@ -18662,5 +19317,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "" @@ -18788,12 +19443,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18807,5 +19462,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "marina" @@ -18877,8 +19532,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18980,10 +19635,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19369,22 +20024,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19416,6 +20071,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19476,8 +20131,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19830,26 +20485,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "sklep" @@ -19921,8 +20576,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20072,9 +20727,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "" @@ -20146,8 +20801,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "" @@ -20218,8 +20873,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20233,5 +20888,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "kamieniołom" @@ -20245,5 +20900,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "Wysypisko smieci" @@ -20265,5 +20920,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "Basen" @@ -20277,5 +20932,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "las" @@ -20289,5 +20944,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20310,5 +20965,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20322,5 +20977,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "Teren przemysłowy" @@ -20334,5 +20989,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20346,5 +21001,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20358,5 +21013,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "Teren kolejowy" @@ -20413,7 +21068,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "Teren wojskowy" @@ -20427,5 +21082,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cmentarz" @@ -20438,5 +21093,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "szczyt" @@ -20451,5 +21106,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "lodowiec" @@ -20463,5 +21118,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "wulkan" @@ -20516,8 +21171,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20531,5 +21186,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20543,5 +21198,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20555,5 +21210,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "Las naturalny" @@ -20567,5 +21222,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "błoto" @@ -20579,5 +21234,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "plaża" @@ -20655,8 +21310,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20704,7 +21359,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "granica" @@ -20846,10 +21501,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "Miejsce" @@ -20897,6 +21552,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adres" @@ -21127,10 +21782,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21178,7 +21833,30 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "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" @@ -21193,4 +21871,13 @@ #~ 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 "Drawbridge" #~ msgstr "Most zwodzony" @@ -21202,10 +21889,35 @@ #~ msgstr "brona" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać " +#~ "automatycznie." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję " +#~ "kasując istniejące archiwum?\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "Wiadukt" +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "" +#~ "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326" + #~ msgid "sports" #~ msgstr "Sklep sportowy" +#~ msgid "Delete and Download" +#~ msgstr "Usuń i pobierz" + #~ msgid "Edit Drawbridge" #~ msgstr "Edycja mostu zwodzonego" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 15801) +++ /applications/editors/josm/i18n/po/ro.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 08:54+0000\n" -"Last-Translator: Nostriel \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-31 13:16+0000\n" +"Last-Translator: twist3r \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\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-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -23,23 +23,22 @@ "X-Poedit-SourceCharset: utf-8\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" -msgstr "" +msgstr "Construind interfata grafica utilizator principala" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Ajutor" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Proiecţia nu a putut fi citită din preferinţe. Folosesc EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "Proiecţia nu a putut fi citită din preferinţe. Se utilizează Mercator" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -47,52 +46,54 @@ "server." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Modificări nesalvate" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Salvez şi Ies" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Renunţ şi Ies" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -100,5 +101,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -107,13 +108,13 @@ msgstr "Renunţă" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:389 +msgstr "Se ignoră URL-ul prost format: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "" +msgstr "Se ingoră fişierul URL prost format: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71 @@ -123,5 +124,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179 msgid "UNKNOWN" -msgstr "" +msgstr "NECUNOSCUT" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120 @@ -143,5 +144,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" -msgstr "Java OpenStreetMap Editor" +msgstr "Editor Java OpenStreetMap" #. Add the version number @@ -150,15 +151,15 @@ #, java-format msgid "Version {0}" -msgstr "" +msgstr "Versiune {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136 #, java-format msgid "Last change at {0}" -msgstr "" +msgstr "Ultima modificare la {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138 #, java-format msgid "Java Version {0}" -msgstr "Java Versiunea {0}" +msgstr "Versiunea Java {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140 @@ -194,5 +195,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Module" @@ -210,9 +211,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." -msgstr "" +msgstr "Adaugă Nod..." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." -msgstr "" +msgstr "Adaugă un nod prin introducerea latitudinii şi longitudinii" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 @@ -231,17 +232,17 @@ #, java-format msgid "Edit: {0}" -msgstr "" +msgstr "Editează: {0}" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." -msgstr "" +msgstr "Introdu coordonatele pentru noul nod." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." -msgstr "" +msgstr "Foloseşte grade zecimale" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." -msgstr "" +msgstr "Valorile negative denotă emisfera Vestică/Sudică" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 @@ -250,5 +251,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 msgid "Latitude" -msgstr "" +msgstr "Latitudine" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 @@ -257,17 +258,17 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 msgid "Longitude" -msgstr "" - +msgstr "Longitudine" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" -msgstr "Aliniază noduri în cerc" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +msgstr "Aliniază Nodurile în Cerc" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Mută nodurile selectate într-un cerc." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -276,8 +277,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -296,13 +298,13 @@ #, java-format msgid "Tool: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +msgstr "Unealtă: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +msgstr "Unele din noduri sunt (aproape) în linie" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." -msgstr "Vă rog selectaţi cel puţin petru noduri." +msgstr "Vă rog selectaţi cel puţin patru noduri." #. Do it! @@ -311,14 +313,14 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 msgid "Align Nodes in Line" -msgstr "" +msgstr "Aliniază Nodurile în Linie" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." -msgstr "Mută nodurile selectate într-un cerc." +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 msgid "Please select at least three nodes." -msgstr "" +msgstr "Te rog selectează cel puţin trei noduri." #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 @@ -335,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "conflict" @@ -341,5 +343,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "download" -msgstr "" +msgstr "descărcare" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 @@ -347,10 +349,10 @@ #, java-format msgid "Zoom to {0}" -msgstr "" +msgstr "Apropie la {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 #, java-format msgid "Zoom the view to {0}." -msgstr "" +msgstr "Apropie vederea la {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 @@ -360,5 +362,5 @@ #, java-format msgid "View: {0}" -msgstr "" +msgstr "Vedere: {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 @@ -373,13 +375,13 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" -msgstr "" +msgstr "Combină calea" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Combine several ways into one." -msgstr "" +msgstr "Combină mai multe căi într-una." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 msgid "Please select at least two ways to combine." -msgstr "" +msgstr "Selectează te rog cel puţin două căi pentru a le combina." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 @@ -395,9 +397,9 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 msgid "Combine Anyway" -msgstr "" +msgstr "Combină oricum" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 msgid "Change directions?" -msgstr "" +msgstr "Schimbă direcţiile?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 @@ -406,8 +408,10 @@ "reverse some of them?" msgstr "" +"Căile nu pot fi combinate în direcţiile actuale. Doreşti să inversezi unele " +"din ele?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 msgid "Reverse and Combine" -msgstr "" +msgstr "Inversează şi Combină" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 @@ -416,5 +420,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 msgid "Enter values for all conflicts." -msgstr "" +msgstr "Introdu valori pentru toate conflictele." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 @@ -422,10 +426,10 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 msgid "Solve Conflicts" -msgstr "" +msgstr "Rezolvă Conflictele" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #, java-format msgid "Combine {0} ways" -msgstr "" +msgstr "Combină {0} căi" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 @@ -473,5 +477,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -482,7 +486,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Şterge" @@ -492,14 +496,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Suprascrie" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Fişierul există. Îl suprascriu?" @@ -527,9 +532,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -567,16 +572,4 @@ msgstr "Părăsiţi aplicaţia." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -646,12 +639,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -659,5 +652,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Eroare" @@ -678,5 +671,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -787,4 +780,18 @@ msgstr "" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -841,67 +848,25 @@ msgstr "fără nume" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Deschide un fişier." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Eroare la prelucrarea {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Extensie fişier necunoscută : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "" - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -972,5 +937,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "" @@ -999,5 +964,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Preferinţe" @@ -1043,14 +1008,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Salvează" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Salvează datele curente." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1058,26 +1028,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Document gol" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Conflicte" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1087,32 +1057,36 @@ "ca şi cum aţi refuzat totul. Continui?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Extensie fişier necunoscută." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "" @@ -1241,56 +1215,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" +msgid "* One node that is used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1300,9 +1274,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1310,5 +1284,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1366,50 +1340,50 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Despre JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Trimite toate schimbările la serverul OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Obiecte de adăugat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Obiecte de modificat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Obiecte de şters:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Nu sunt schimbări de transmis." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1613,14 +1587,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 +msgid "Select node under cursor." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 #, java-format msgid "Insert new node into way." @@ -1629,14 +1603,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "" @@ -1656,5 +1630,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -1665,5 +1639,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "" @@ -1698,10 +1672,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1724,16 +1698,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1741,145 +1715,155 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "foot: - key=foot set to any value." -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "Special targets:" +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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1893,14 +1877,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "" @@ -1936,7 +1950,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Adaugă" @@ -1977,4 +1991,8 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -1982,58 +2000,10 @@ msgstr "Rezolvă {0} conflicte în {1} obiecte" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Mută" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2046,334 +2016,7 @@ msgstr[2] "de noduri" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Secvenţă" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "diferit" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "şters" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "adevărat" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "fals" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "poziţie" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "incomplet" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 -#: ../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:483 -msgid "relation" -msgid_plural "relations" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121 -msgid "highway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122 -#: build/trans_presets.java:2993 -msgid "railway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 -msgid "waterway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124 -msgid "landuse" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 -#, java-format -msgid "{0} node" -msgid_plural "{0} nodes" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 -msgid "Area style way is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -msgid "More than one \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 -msgid "More than one \"via\" found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 -msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 -msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 -msgid "No \"via\" node or way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 -msgid "The \"from\" way doesn't start or end at a \"via\" node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -msgid "The \"to\" way doesn't start or end at a \"via\" node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 -msgid "The \"to\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 -msgid "text" -msgstr "" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 @@ -2386,4 +2029,425 @@ msgstr[2] "de căi" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 +#: ../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:483 +msgid "relation" +msgid_plural "relations" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Mută" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Secvenţă" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "diferit" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "şters" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "adevărat" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "fals" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "poziţie" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "incomplet" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121 +msgid "highway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122 +#: build/trans_presets.java:2993 +msgid "railway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +msgid "waterway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124 +msgid "landuse" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#, java-format +msgid "{0} node" +msgid_plural "{0} nodes" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 +msgid "Area style way is not closed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 +#, java-format +msgid "Deleted member ''{0}'' in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 +#, java-format +msgid "Way ''{0}'' with less than two points." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 +msgid "More than one \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 +msgid "No \"from\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 +msgid "No \"to\" way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 +msgid "The \"from\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 +msgid "text" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 #, java-format @@ -2404,5 +2468,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2473,4 +2537,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2485,4 +2550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2689,26 +2755,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Unelte" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2717,21 +2783,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "" @@ -2841,4 +2907,493 @@ msgstr "" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Elimină" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2852,5 +3407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2883,9 +3438,9 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Rezolvă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2893,24 +3448,68 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Îmbin conflictele." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Rezolvare conflicte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" msgstr "" @@ -3073,10 +3672,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 msgid "Member Of" -msgstr "" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" msgstr "" @@ -3261,8 +3854,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3296,11 +3885,4 @@ msgid "Move the currently selected members down" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Elimină" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3355,5 +3937,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3378,5 +3960,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3403,24 +3985,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Au existat conflicte în timpul importului." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "" @@ -3673,10 +4255,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3716,5 +4292,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3752,53 +4328,53 @@ msgstr "Timpul introdus nu a putut fi interpretat." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "punct gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Personalizează trasarea liniilor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Utilizează opţiunile globale." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Nu trasa linii între puncte pentru acest strat." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Selectaţi opţiunile pentru trasarea liniilor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Personalizează culoarea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3806,6 +4382,6 @@ msgstr "Implicit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3813,31 +4389,31 @@ msgstr "Alegeţi o culoare" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importă imagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3846,5 +4422,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3853,5 +4429,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3860,28 +4436,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Converteşte la strat de date" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3890,11 +4466,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3904,29 +4480,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3935,9 +4511,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3945,5 +4521,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3960,24 +4536,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} şters.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4015,5 +4591,5 @@ msgstr[2] "de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4023,5 +4599,5 @@ msgstr[2] "o urmă cu {0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4031,5 +4607,5 @@ msgstr[2] "{0} este format din {1} de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4163,5 +4739,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Vă rog selectaţi rândul care va fi şters." @@ -5497,5 +6073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "" @@ -5507,6 +6083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5514,4 +6089,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5873,5 +6452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5882,15 +6461,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5901,18 +6480,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -5950,6 +6529,51 @@ msgstr "Pregătesc datele..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +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/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "" + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" msgstr "" @@ -6008,4 +6632,13 @@ msgid "Unknown host" msgstr "Gazdă necunoscută" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6034,8 +6667,16 @@ msgstr "Anulez..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6125,5 +6766,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6143,15 +6784,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6161,20 +6807,31 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" msgstr "" @@ -6191,25 +6848,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Modulul nu a fost găsit: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6217,21 +6874,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6239,5 +6896,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6245,19 +6902,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6265,5 +6922,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6271,19 +6928,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6292,13 +6949,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6308,9 +6965,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6320,10 +6977,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6346,37 +6999,14 @@ msgstr "necunoscut" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6513,9 +7143,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6683,4 +7308,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Eroare la prelucrarea {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -6902,6 +7532,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -7218,36 +7848,41 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" msgstr "" @@ -7257,16 +7892,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7275,14 +7915,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7753,7 +8393,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "" @@ -8129,16 +8769,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Extensie fişier necunoscută : {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8225,5 +8870,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8250,25 +8895,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8441,11 +9086,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8455,8 +9100,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8467,5 +9108,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8474,5 +9115,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8494,7 +9135,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9382,7 +10029,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "" @@ -9396,5 +10043,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9484,4 +10131,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9558,36 +10221,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9601,51 +10264,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9731,7 +10394,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9881,6 +10543,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10698,5 +11365,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10744,5 +11411,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10779,5 +11446,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11009,6 +11676,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11034,6 +11701,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "" @@ -11059,6 +11726,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "" @@ -11084,6 +11751,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "" @@ -11097,5 +11764,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "" @@ -11113,5 +11780,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "" @@ -11129,5 +11796,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11154,6 +11821,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11203,5 +11870,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "" @@ -12180,5 +12847,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -13902,27 +14569,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "" @@ -16760,8 +17427,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "" @@ -16822,6 +17489,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16832,8 +17497,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -16859,5 +17524,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "" @@ -16942,4 +17607,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -16954,8 +17620,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -16975,5 +17643,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17063,7 +17731,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "" @@ -17327,15 +17995,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17377,5 +18045,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17585,11 +18253,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17627,6 +18295,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "" @@ -17682,7 +18350,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17738,8 +18406,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17760,5 +18428,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17772,5 +18440,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17791,5 +18459,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17804,5 +18472,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17817,5 +18485,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "" @@ -17829,5 +18497,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "" @@ -17841,5 +18509,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -17867,5 +18535,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18033,13 +18701,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18101,7 +18769,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18124,10 +18792,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18157,6 +18825,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18201,6 +18869,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18214,5 +18882,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18234,5 +18902,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18246,5 +18914,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18292,7 +18960,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18309,5 +18977,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18322,5 +18990,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18335,5 +19003,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18348,5 +19016,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18361,5 +19029,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18374,5 +19042,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18477,10 +19145,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18493,8 +19161,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "" @@ -18508,5 +19174,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "" @@ -18634,12 +19300,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18653,5 +19319,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18723,8 +19389,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18826,10 +19492,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19215,22 +19881,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19262,6 +19928,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19322,8 +19988,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19676,26 +20342,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "" @@ -19767,8 +20433,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "" @@ -19918,9 +20584,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "" @@ -19992,8 +20658,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "" @@ -20064,8 +20730,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20079,5 +20745,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "" @@ -20091,5 +20757,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20111,5 +20777,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20123,5 +20789,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "" @@ -20135,5 +20801,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20156,5 +20822,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20168,5 +20834,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "" @@ -20180,5 +20846,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20192,5 +20858,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20204,5 +20870,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20259,7 +20925,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "" @@ -20273,5 +20939,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "" @@ -20284,5 +20950,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "" @@ -20297,5 +20963,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "" @@ -20309,5 +20975,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "" @@ -20362,8 +21028,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20377,5 +21043,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20389,5 +21055,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20401,5 +21067,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "" @@ -20413,5 +21079,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "" @@ -20425,5 +21091,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "" @@ -20501,8 +21167,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20550,7 +21216,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "" @@ -20692,10 +21358,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20743,6 +21409,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "" @@ -20973,10 +21639,10 @@ msgstr "" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21023,2 +21689,13 @@ msgid "Streets NRW Geofabrik.de" msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 15801) +++ /applications/editors/josm/i18n/po/ru.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-22 15:05+0000\n" -"Last-Translator: Bedouin2 \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-05 18:32+0000\n" +"Last-Translator: Egor Bushmelyov \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,10 +17,10 @@ "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-05-23 20:13+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:44+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:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -28,68 +28,71 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Проекция не может быть прочитана из настроек. Используется EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" +"Невозможно прочитать вид проекции из настроек. Используется проекция " +"Меркатора" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Сохранить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -97,5 +100,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -104,10 +107,10 @@ msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -191,5 +194,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Модули" @@ -256,15 +259,15 @@ msgstr "Долгота" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Переместить выделенные точки так, чтобы они сформировали окружность." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -273,8 +276,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -295,9 +299,9 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Некоторые точки - (почти) на одной линии" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Выделите не менее четырёх точек." @@ -333,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "конфликт" @@ -478,5 +482,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -487,7 +491,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Удалить" @@ -497,14 +501,15 @@ msgstr "Удалить выделенные объекты." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Перезаписать" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Файл уже существует. Перезаписать?" @@ -532,9 +537,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -572,16 +577,4 @@ msgstr "Выйти из программы" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM файлы сервера" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPS файлы" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 файлы" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -655,12 +648,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -668,5 +661,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Ошибка" @@ -687,5 +680,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -805,4 +798,18 @@ msgstr "Объединить {0} точек" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -859,67 +866,25 @@ msgstr "безымянный" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Открыть..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Открыть файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Ошибка разбора {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Неизвестное расширение файла: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Маркеры из {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Координаты импортированы: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Неправильно составленные предложения: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Ошибки контрольных сумм: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Неизвестные предложения: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Пустые координаты: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Импорт NMEA успешно завершён" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Сбой при импорте NMEA!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -999,5 +964,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Вставить" @@ -1026,5 +991,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Настройки" @@ -1070,14 +1035,19 @@ msgstr "Изменить направление линии" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Сохранить текущие данные." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1087,26 +1057,26 @@ "создайте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Нет открытых документов. Нечего сохранять." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Пустой документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "В документе не содержиться данных" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Сохранить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1116,32 +1086,36 @@ "будут обработаны, как будто вы отменили их все. Продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Отказаться от конфликтов и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Сохранить файл OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Сохранить файл GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Сохранить файл OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Невозможно создать резервную копию." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Неизвестное расширение файла." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "При сохранении возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "При восстановлении из резервной копии возникла ошибка." @@ -1289,52 +1263,52 @@ msgstr "Включает/выключает глобальную установку: «{0}»." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разъединить линии" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублировать точки, используемые несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "Данная точка не связана с чем-либо еще." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "Ни одна из этих линий не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Одна точка с тэгами, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +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 -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:117 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:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1343,5 +1317,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1354,9 +1328,9 @@ "дубликаты точек, и все точки будут выбраны" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1364,5 +1338,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1423,50 +1397,50 @@ "желаете продолжить?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Загрузить на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Удаляемые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишите изменения для закачиваемых данных:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Загрузить эти изменения?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Загрузить изменения" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Нет изменений для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1673,14 +1647,14 @@ msgstr "Добавить точку к линии и объединить" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Создать новую точку" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Выбирете точко под курсором" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1690,14 +1664,14 @@ msgstr[2] "Вставить новую точку в {0} линий" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 msgid "Start new way from last node." msgstr "Начать путь с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Продолжить путь с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Закончено вычерчивание" @@ -1717,5 +1691,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." @@ -1726,5 +1700,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." @@ -1763,5 +1737,5 @@ msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1770,5 +1744,5 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1796,16 +1770,16 @@ "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1813,96 +1787,106 @@ msgstr "Никаких данных не загружено" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 msgid "replace selection" msgstr "заменить выделение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 msgid "add to selection" msgstr "добавить к выделению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 msgid "remove from selection" msgstr "убрать из выделения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "case sensitive" msgstr "регистрозависимый" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "regular expression" msgstr "регулярное выражение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "Special targets:" msgstr "Специальные цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 +#: ../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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "Use | or OR to combine with logical or" msgstr "" @@ -1910,5 +1894,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1916,46 +1900,46 @@ "ключ содержит двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1972,15 +1956,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Отсутствуют параметры для \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Отсутствуют параметры для \"НЕ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." msgstr "Отсутствует закрывающая скобка" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -2015,7 +2029,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Добавить" @@ -2056,4 +2070,8 @@ msgstr "Установить {0}={1} для {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2061,65 +2079,10 @@ msgstr "Разрешить {0} конфликтов в {1} объектах" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Удалить {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Удалить {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Конфликтующее отношение" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Удалить из связи" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -msgid "Split way segment" -msgstr "Разделить сегмент линии" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Переместить" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2132,169 +2095,20 @@ msgstr[2] "узлов" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Удалить Участника Отношения" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Вращать" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Последовательность" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Применить?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Применить выбранные изменения" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Не применять изменения" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "Пожалуйста, выберите, какие параметры нужно изменить." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Параметры " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Роли в отношениях, относящихся к" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Автоматически исправлять тэги" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Ошибка в файле конфигурации на строках {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Не удается прочитать каталог с настройками: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "различный" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "удалён" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "истина" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "ложь" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "положение" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Десятичные градусы" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Градусы, минуты, секунды" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "Ю" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "С" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "З" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "В" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "неполный" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Ошибка: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Предупреждение: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "линия" +msgstr[1] "линии" +msgstr[2] "линий" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2307,4 +2121,264 @@ msgstr[2] "отношений" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Удалить {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Конфликтующее отношение" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +msgid "Split way segment" +msgstr "Разделить сегмент линии" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Переместить" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Удалить Участника Отношения" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Вращать" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Последовательность" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Применить?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "различный" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "удалён" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "истина" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "ложь" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "положение" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Десятичные градусы" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Градусы, минуты, секунды" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "Ю" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "С" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "З" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "В" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "неполный" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Ошибка: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Предупреждение: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2341,139 +2415,129 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Путь, обозначающий границу области, не закрыт." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "многополигональная линия ''{0}'' не замкнута" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "В отношении имеется пустой член." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В отношении «{0}» имеется член, который был удален." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Путь «{0}» имеет меньше двух точек." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Найден больше чем один \"from\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Найден больше чем один \"to\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Найден больше чем один \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестная роль «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестный тип членства для «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Не найден путь \"from\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Не найден путь \"to\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Не найдена \"via\" точка или путь" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Стиль для ограничения {0} не найден." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Нет полезного значения ''{0}'' для пути ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "не-линия ''{0}'' в мультиполигональном отношении" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Для мультиполигона «{0}» отсутствует внешний путь." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Внутренний путь «{0}» находится снаружи." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стиль для внешней границы ''{0}'' отсутствует." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "без тэга" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "текст" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "линия" -msgstr[1] "линии" -msgstr[2] "линий" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2495,5 +2559,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2559,4 +2623,10 @@ "Do not upload any data after this message." msgstr "" +"Проекция \"{0}\" разработана только для\n" +"широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n" +"Если Вы не работаете над данными,\n" +"относящимися к Швейцарии либо Лихтенштену, \n" +"воспользуйтесь другой системой проекции .\n" +"Не делайте выгрузку данных после данного сообщения." #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138 @@ -2574,4 +2644,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2586,4 +2657,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2797,26 +2869,26 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2825,21 +2897,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Показать/скрыть каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Переключить в Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Аудио" @@ -2949,4 +3021,493 @@ msgstr "Инициализация" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Тэги" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Участники" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Удалить" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Роль" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2960,5 +3521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2989,33 +3550,77 @@ msgstr "Выбрать на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Разрешить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Открыть диалоговое окно для слияния выбранных объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Разрешение конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Разрешить конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Разрешить конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Конфликты: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Предупреждение" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3178,10 +3783,4 @@ msgid "Member Of" msgstr "Член группы" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Роль" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3369,8 +3968,4 @@ msgstr "Тэги (пустое значение удаляет тэг)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Участники" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3404,11 +3999,4 @@ msgid "Move the currently selected members down" msgstr "Переместить выбранных членов отношения вниз" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Удалить" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3463,5 +4051,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3486,5 +4074,5 @@ msgstr "да" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3511,24 +4099,24 @@ msgstr "нет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Участники: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор отношений: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "При импортировании возникли конфликтные ситуации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Ошибка при разборе ответа от сервера." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Невозможно связаться с сервером." @@ -3785,10 +4373,4 @@ msgstr "Картинка {0} не существует или произошла ошибка чтения." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Предупреждение" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3828,5 +4410,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3864,53 +4446,53 @@ msgstr "Введённое время невозможно использовать" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "точка GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Использовать глобальные настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 msgid "Draw lines between points for this layer." msgstr "Отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Выбрать варианты отрисовки линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Выбрать цвет" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3918,6 +4500,6 @@ msgstr "По умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3925,31 +4507,31 @@ msgstr "Выбор цвета" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Маркеры из именованых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Назвать маршрутные точки из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Импортировать аудиофайлы" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Аудиофайлы Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Аудиомаркеры из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Импорт изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3959,5 +4541,5 @@ msgstr[2] "{0} дорожек, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3967,5 +4549,5 @@ msgstr[2] "{0} маршрутов, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3975,28 +4557,28 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Временной интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Длина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -4007,11 +4589,11 @@ "
Если хотите загрузить трэк, сделайте это по ссылке:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4021,29 +4603,29 @@ msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Скачать с JSM данные вдоль трэка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4054,9 +4636,9 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4066,5 +4648,5 @@ "будут пропущены или перенесены в начало трека." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4083,24 +4665,24 @@ msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4138,5 +4720,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4146,5 +4728,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4154,5 +4736,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4295,5 +4877,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Пожалуйста, выберите ряд для удаления." @@ -5661,5 +6243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Обновить" @@ -5671,7 +6253,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Добавьте site-josm.xml, либо страницы Wiki" +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5679,4 +6260,8 @@ msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6060,5 +6645,5 @@ msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6069,15 +6654,15 @@ msgstr "Не удалось прочитать помеченные настройки исходника: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6088,18 +6673,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Ничего не выбрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Элементы выбраны неверно!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Изменить параметры" @@ -6137,8 +6722,53 @@ msgstr "Подготовка данных..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPS файлы" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Маркеры из {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Ошибка разбора: неправильная структура документа gpx" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 файлы" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Координаты импортированы: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Неправильно составленные предложения: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Ошибки контрольных сумм: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Неизвестные предложения: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Пустые координаты: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Импорт NMEA успешно завершён" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Сбой при импорте NMEA!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6151,4 +6781,6 @@ "{0} to {1}." msgstr "" +"Поддерживает протокол версии 0.5 и 0.6, тогда как сервер сообщает о " +"поддержке {0} до {1}." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 @@ -6172,5 +6804,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "No changeset present for diff upload" -msgstr "" +msgstr "Нет изменений для выгрузки" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 @@ -6190,9 +6822,18 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 msgid "Not initialized" -msgstr "" +msgstr "Не инициализированно" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 msgid "Unknown host" msgstr "Неизвестный хост" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6221,8 +6862,16 @@ msgstr "Прерывание..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Ошибка при разборе." +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +msgid "OSM Server Files" +msgstr "OSM файлы сервера" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6266,7 +6915,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "В отношении «{0}» имеется член, который был удален." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6314,5 +6963,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6336,15 +6985,20 @@ "повторите попытку позже." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Обновить модули" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Скачать модули" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6357,22 +7011,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." -msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Невозможно скачать модуль: {0} из {1} доступных" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "Модуль {0} поврежден, либо не скачался автоматически" +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6390,25 +7054,25 @@ "требуется." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Для работы модуля нужна более новая версия JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Модуль не найден : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последнее обновление модулей более {0} дней назад" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6418,21 +7082,21 @@ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Отключить модуль" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Сохранение плагина" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6442,5 +7106,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6448,10 +7112,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6460,9 +7124,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6472,5 +7136,5 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6479,19 +7143,19 @@ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Информация" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "описание отсутствует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6501,13 +7165,13 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6520,9 +7184,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6535,10 +7199,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Скачать модули" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6561,41 +7221,14 @@ msgstr "неизвестный" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Модуль уже существует" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Архив с модулем уже существует. Скачать текущую версию и удалить " -"существующий архив?\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Удалить и скачать" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Ошибка при скачивании модуля: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6749,9 +7382,4 @@ msgstr "Пожалуйста введите описание вашего трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Тэги" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6923,4 +7551,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файл {0} загружен под именем \"{1}\"" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Ошибка разбора {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7155,6 +7788,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -7494,37 +8127,42 @@ "Выберите сначала один из них, а затем повторите" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Пустой слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "слой WMS ({0}), {1} фрагмент(ы) загружен(ы)" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Не векторизованны." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Центр растра: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Векторизован." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "общий квадрат: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7533,6 +8171,11 @@ msgstr "Загрузить слой WMS из файла" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7540,10 +8183,10 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7554,14 +8197,14 @@ "Создайте новый файл." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Ошибка формата кеша" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, 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:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Ошибка кеширования зоны Ламберта" @@ -7602,7 +8245,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Разделить линию" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7913,5 +8555,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 msgid "Lake Walker." -msgstr "Озёрный Уокер" +msgstr "Трассировщик озёр" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 @@ -7959,5 +8601,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 msgid "Lakewalker trace" -msgstr "ОзёрныйУокер трассировщик" +msgstr "Трассировщик озёр" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -8036,7 +8678,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "вода" @@ -8433,16 +9075,21 @@ msgstr "Неизвестный статус проблемы" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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:45 +#: ../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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "Не открыта область - невозможно определить границы!" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Неизвестное расширение файла: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8537,5 +9184,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8548,9 +9195,9 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73 msgid "Click to add destination." -msgstr "" +msgstr "Нажмите чтобы добавить назначение." #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88 msgid "Click and drag to move destination" -msgstr "" +msgstr "Нажмите и перетащите, чтобы переместить назначение." #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77 @@ -8562,25 +9209,25 @@ msgstr "Открыть список узлов маршрутизации" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" -msgstr "" - -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +msgstr "Добавить слой путей." + +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Критерии" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Кратчайший" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Самый быстрый" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Обратный маршрут" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Очистить маршрут" @@ -8755,11 +9402,11 @@ msgstr "конец" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Редактировать теги" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Запуск диалога тег редактора" @@ -8769,8 +9416,4 @@ msgstr "JOSM Тег Редактор Плагин" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(отсутствует)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8781,5 +9424,5 @@ msgstr "<множественный>" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8789,5 +9432,5 @@ msgstr[2] "Удалить старые ключи из {0} объектов" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8810,8 +9453,14 @@ msgstr "Фильтр" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Очистить" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9737,7 +10386,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "здание" @@ -9751,5 +10400,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "область" @@ -9841,4 +10490,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9939,19 +10604,19 @@ "Это может привести к неправильным координатам." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9960,17 +10625,17 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные фрагменты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Альфа канал" @@ -9984,51 +10649,51 @@ msgstr "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Имя пункта меню (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Копия поумолчанию" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Пожалуйста, выберите ряд для копирования." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "Накладывающиеся части" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lat:" msgstr "% широты:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "% of lon:" msgstr "% долготы:" @@ -10127,11 +10792,7 @@ #: build/trans_plugins.java:17 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 "" -"Главная особенность плагина является возможность удаления точек на GPX " -"треке. Этот плагин может быть использован для подготовки треков для загрузки " -"на OSM. Например, удалить неинтересные части трека." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" #. Plugin globalsat @@ -10161,5 +10822,5 @@ #: build/trans_plugins.java:25 msgid "Helps vectorizing WMS images." -msgstr "Помогите векторизации WMS изображений." +msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps @@ -10222,4 +10883,6 @@ "align it with the map." msgstr "" +"Этот модуль позволяет отображать любую картинку как подложку в редакторе и " +"выравнивать её на карте." #. Plugin plastic_laf @@ -10308,6 +10971,11 @@ "правописание для комплексных имён тегов." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11127,5 +11795,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "частный" @@ -11173,5 +11841,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "назначение" @@ -11208,5 +11876,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "разрешающее" @@ -11438,6 +12106,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "Автобан" @@ -11463,6 +12131,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "Автострада" @@ -11488,6 +12156,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "Основная" @@ -11513,6 +12181,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "Вторичная" @@ -11526,5 +12194,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "Третичная" @@ -11542,5 +12210,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "местного значения" @@ -11558,5 +12226,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "Служебная" @@ -11583,6 +12251,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "Строительство" @@ -11632,5 +12300,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "Круг" @@ -12609,5 +13277,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "Болото" @@ -14331,27 +14999,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "спорт" @@ -15472,5 +16140,5 @@ #: build/trans_presets.java:2183 msgid "alphabetic" -msgstr "" +msgstr "алфавитный" #: build/trans_presets.java:2186 @@ -17189,8 +17857,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "велосипедный" @@ -17251,6 +17919,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17261,8 +17927,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "пеший" @@ -17288,5 +17954,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "метро" @@ -17371,4 +18037,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17383,8 +18050,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17404,5 +18073,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "стандартный" @@ -17492,7 +18161,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "мост" @@ -17756,15 +18425,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "уменьшать" @@ -17806,5 +18475,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "лошадь" @@ -18014,13 +18683,13 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" -msgstr "" +msgstr "ограждение" #. color tertiary @@ -18056,6 +18725,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "улица" @@ -18111,7 +18780,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "шоссе" @@ -18167,8 +18836,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "железная дорога" @@ -18189,7 +18858,7 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" -msgstr "" +msgstr "услуги" #. color services @@ -18201,5 +18870,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "брод" @@ -18220,5 +18889,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "кольцо" @@ -18233,7 +18902,7 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" -msgstr "" +msgstr "пункт неотложной помощи" #. color water @@ -18246,5 +18915,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "берег реки" @@ -18258,5 +18927,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "поток" @@ -18270,5 +18939,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "док" @@ -18296,5 +18965,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "акведук" @@ -18462,13 +19131,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "искусственный" @@ -18530,7 +19199,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "железнодорожная станция" @@ -18553,10 +19222,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "другая жд дорога" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "жд дорога сверху" @@ -18586,6 +19255,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "Старая жд дорога" @@ -18630,6 +19299,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "воздушная трасса" @@ -18643,5 +19312,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "пассажирский терминал" @@ -18663,5 +19332,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "воздушная трасса темная" @@ -18675,5 +19344,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "воздушная трасса светлая" @@ -18721,7 +19390,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "воздушная трасса" @@ -18738,5 +19407,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "легкая трасси" @@ -18751,5 +19420,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "промежуточная трасса" @@ -18764,5 +19433,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "продвинутая трасса" @@ -18777,7 +19446,7 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" -msgstr "" +msgstr "специалист лыжной трассы" #. color piste_expert @@ -18790,5 +19459,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "бесплатная трасса" @@ -18803,5 +19472,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "трасса для новичков" @@ -18906,10 +19575,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "энергия" @@ -18922,8 +19591,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "плотина" @@ -18937,5 +19604,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "трубопровод" @@ -19063,12 +19730,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "свободное время" @@ -19082,5 +19749,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "гавань" @@ -19152,8 +19819,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "использование" @@ -19255,10 +19922,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "режим использования" @@ -19644,22 +20311,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "легкое использование" @@ -19691,6 +20358,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "легкая вода" @@ -19751,8 +20418,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "здоровье" @@ -20105,26 +20772,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "Магазин" @@ -20196,8 +20863,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "отель" @@ -20347,9 +21014,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "туризм" @@ -20421,8 +21088,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "исторический" @@ -20493,8 +21160,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "зеленый" @@ -20508,5 +21175,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "карьер" @@ -20520,5 +21187,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "мусорная свалка" @@ -20540,5 +21207,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "водоём" @@ -20552,5 +21219,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "лес" @@ -20564,5 +21231,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "двор фермы" @@ -20585,5 +21252,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "розничная продажа" @@ -20597,5 +21264,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "промышленный" @@ -20609,5 +21276,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "заброшенная застройка" @@ -20621,5 +21288,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "участок для застройки" @@ -20633,5 +21300,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "жд разъезд" @@ -20688,7 +21355,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "военный" @@ -20702,5 +21369,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "кладбище" @@ -20713,5 +21380,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "пик" @@ -20726,5 +21393,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "ледник" @@ -20738,5 +21405,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "вулкан" @@ -20791,8 +21458,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "природный" @@ -20806,5 +21473,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "кустарник" @@ -20818,5 +21485,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "здоровье" @@ -20830,5 +21497,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "лес" @@ -20842,5 +21509,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "грязь" @@ -20854,5 +21521,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "пляж" @@ -20930,8 +21597,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "маршрут" @@ -20979,7 +21646,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "граница" @@ -21121,10 +21788,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "место" @@ -21172,6 +21839,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "адрес" @@ -21402,10 +22069,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Открыте Воздушные Карты" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21453,4 +22120,33 @@ msgstr "Улицы NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" + +#~ 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." +#~ msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" + +#~ msgid "Navigation" +#~ msgstr "Навигация" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21460,10 +22156,4 @@ #~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." -#~ msgid "Commit comment" -#~ msgstr "Комментарий правки" - -#~ msgid "Navigation" -#~ msgstr "Навигация" - #~ msgid "Charge" #~ msgstr "Переодевание" @@ -21475,4 +22165,13 @@ #~ 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 "Drawbridge" #~ msgstr "Подъёмный мост" @@ -21484,4 +22183,20 @@ #~ msgstr "Опускающаяся решётка" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" + +#~ 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 "viaduct" #~ msgstr "виадук" @@ -21490,4 +22205,7 @@ #~ msgstr "Спортивный" +#~ msgid "Delete and Download" +#~ msgstr "Удалить и скачать" + #~ msgid "Edit Drawbridge" #~ msgstr "Править подъёмный мост" @@ -21496,4 +22214,13 @@ #~ msgstr "Править опускающуюся решётку" +#~ 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 "" +#~ "Главная особенность плагина является возможность удаления точек на GPX " +#~ "треке. Этот плагин может быть использован для подготовки треков для " +#~ "загрузки на OSM. Например, удалить неинтересные части трека." + #~ msgid "Remove route nodes" #~ msgstr "Удалить узлы маршрутизации" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 15801) +++ /applications/editors/josm/i18n/po/sk.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:42+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-08 04:20+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,8 +16,8 @@ "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-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,68 +25,71 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Nápoveda" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Projekcia nemôže byť načítaná z nastavení. Použijem EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" +"Typ projekcie nie je možné prečítať z nastavení. Použije sa Mercator " +"projekcia." + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Neuložené zmeny" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Uložiť a Ukončiť" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Zrušiť a Ukončiť" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -94,5 +97,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -101,10 +104,10 @@ msgstr "Zrušiť" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem skomolenú URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -188,5 +191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Pluginy" @@ -194,5 +197,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 msgid "About JOSM..." -msgstr "O JOSMe..." +msgstr "O programe JOSM..." #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190 @@ -253,15 +256,15 @@ msgstr "Zemepisná dĺžka" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Zarovnať body do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 msgid "Move the selected nodes into a circle." msgstr "Presunúť označené body do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -270,8 +273,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -292,9 +296,9 @@ msgstr "Nástroj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Niektoré z bodov sú (skoro) na priamke" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Vyberte minimálne 4 body" @@ -329,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -471,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -480,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Odstrániť" @@ -490,14 +494,15 @@ msgstr "Zmazať zvolené objekty." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Prepísať" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Súbor už existuje. Prepísať?" @@ -508,5 +513,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 msgid "Distribute Nodes" -msgstr "Rozložiť body" +msgstr "Rozložiť body rovnomerne" #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 @@ -525,9 +530,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -565,16 +570,4 @@ msgstr "Ukončť program." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "Súbory OSM Servera" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX súbory" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183 súbory" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -648,12 +641,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -661,5 +654,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Chyba" @@ -680,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -796,4 +789,18 @@ msgstr "Zlúčiť {0} body" +#: ../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:70 +msgid "Mirror" +msgstr "Zrkadlo" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "Zrkadlovo vybrané body a cesty." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Prosím vyberte aspoň jeden bod, alebo cestu." + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -850,67 +857,25 @@ msgstr "nepomenované" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Otvoriť..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Otvoriť súbor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Chyba pri rozkladaní {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Neznámy typ súboru: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Zvýrazňovače z {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Importované súradnice: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Poškodené údaje(vety): " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Chyby v kontrolnom súčte: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Neznáme údaje(vety): " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Nulové súradnice: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA import úspešný" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA import zlyhal!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -985,5 +950,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Vložiť" @@ -1012,5 +977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Nastavenia" @@ -1056,14 +1021,19 @@ msgstr "Otočiť smer ciest" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Uložiť" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Uložiť aktuálne dáta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Súbor {0} existuje. Prepísať ho?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1072,26 +1042,26 @@ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Prázdny dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokument neobsahuje dáta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Uložiť akokoľvek" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1101,32 +1071,36 @@ "vyriešené, ako by boli všetky odmietnuté. Pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Zamietnuť konflikty a Uložiť" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Uložiť OSM súbor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Uložiť GPX súbor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Uložiť OSM súbor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "Uložiť vrstvu" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Nemôžem zálohovať súbor." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Neznáma prípona súboru" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Počas ukladania došlo k chybe." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Počas obnovenia zálohy došlo k chybe." @@ -1273,55 +1247,55 @@ msgstr "Zapnúť/Vypnúť globálne nastavenie ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozpojiť cesty" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Zduplikovať body používané viacerými cestami." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* Jeden označený bod, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Jednu cestu s jedným, alebo viac bodov používanými vo viac než jednej " +"ceste, alebo" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Jednu cestu s jedným, alebo viac bodov používanými vo viac než jednej " -"ceste, alebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1329,5 +1303,5 @@ "ceste." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1340,9 +1314,9 @@ "svoje vlastné kópie a všetky bodybudú vybraté." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Nepripojený bod (Unglued Node)" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1350,5 +1324,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1410,50 +1384,50 @@ "pokračovať?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." -msgstr "Nahrať do OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +msgstr "Uložiť do OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." -msgstr "Nahrať všetky zmeny na OSM server." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +msgstr "Uložiť všetky zmeny na OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Pridané objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Upravené objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Odstránené objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Uložiť tieto úpravy?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Nahrať zmeny" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Žiadne zmeny pre uloženie." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1659,14 +1633,14 @@ msgstr "Pridať bod do cesty a spojiť" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Vytvoriť nový bod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Zvoliť bod pod kurzorom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1676,14 +1650,14 @@ msgstr[2] "Vložiť nový bod do {0} ciest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 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:903 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 msgid "Continue way from last node." msgstr "Pokračovanie cesty z posledného bodu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Koniec kreslenia." @@ -1703,5 +1677,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." @@ -1713,5 +1687,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Pustite tlačítko myši k zastaveniu otáčania" @@ -1749,5 +1723,5 @@ msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1755,5 +1729,5 @@ "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1780,16 +1754,16 @@ "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:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1797,55 +1771,67 @@ msgstr "Neboli načítané žiadne dáta." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1854,92 +1840,93 @@ "b>)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +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 "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +"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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1956,15 +1943,50 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Neočakávaná značka: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Chýbajúci argument pre \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Chýbajúci argument pre \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +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:595 +#, 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:602 +#, 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:33 @@ -1999,7 +2021,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Pridať" @@ -2040,4 +2062,8 @@ msgstr "Nastavené {0}={1} pre {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "ZmeňÚlohuČlenaRelácie" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2045,65 +2071,10 @@ msgstr "Vyriešiť {0} konfliktov v {1} objektoch." -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Zmazať {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Zmazať {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Konfliktné vzťahy (relation)" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Zmazať z relácie (zo vzťahu" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Presunúť" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2116,169 +2087,20 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "Odstrániť súvisiaceho(vzťahového) člena" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Otočiť" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekvencia" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Použiť?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Použiť zvolené zmeny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Neurobiť zmeny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Vlastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "Funkcie vo vzťahoch (relations) odkazujú na" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatická úprava značiek (tag)" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, 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:320 -#, 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:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "rôzne" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "zmazané" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "áno (pravda)" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "nie (nepravda)" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "pozícia (miesto)" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Stupne" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Stupne minúty sekundy" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "J" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "Z" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "neúplný" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Chyba: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Varovanie: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "cestu" +msgstr[1] "cesty" +msgstr[2] "ciest" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2291,4 +2113,264 @@ msgstr[2] "vzťahov (relations)" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Zmazať {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Zmazať {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Konfliktné vzťahy (relation)" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Presunúť" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "Vyriešte rozpor v poradovom čísle relácie {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "Odstrániť súvisiaceho(vzťahového) člena" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Otočiť" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekvencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, 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/VersionConflictResolveCommand.java:57 +#, 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:52 +#, 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/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Použiť?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "rôzne" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "zmazané" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "áno (pravda)" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "nie (nepravda)" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "pozícia (miesto)" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Stupne" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Stupne minúty sekundy" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "J" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "Z" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "neúplný" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Chyba: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Varovanie: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2325,139 +2407,129 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Cesta označená ako plocha nie je uzavretá." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Prázdny člen vo vzťahu (relation)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Cesta ''{0}'' s menej, než dvoma bodmi." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Najdená viac než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Najdené viac cieľových \"to\" ciest." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Viac ako jedna \"via\" najdená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznáma funkcia ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Neznámy typ člena pre ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Nenajdená cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Nenajdená cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Nie je \"via\" bod alebo cesta najdená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Štýl pre obmedzenie {0} nenajdený." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Vnútorná(inner) cesta ''{0}'' je vonku." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "neoznačený" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "cestu" -msgstr[1] "cesty" -msgstr[2] "ciest" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2479,5 +2551,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2564,4 +2636,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2576,4 +2649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2787,26 +2861,26 @@ msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2815,21 +2889,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Prepnúť drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Prepínač pohladu na celej obrazovke" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Zvuk" @@ -2908,5 +2982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." -msgstr "Kontaktujem OSM server..." +msgstr "Pripája sa na OSM server..." #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104 @@ -2938,4 +3012,520 @@ msgid "Initializing" msgstr "Prebieha inicializácia" + +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "Môj s Ich" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "Môj so zlúčeným" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "Ich so zlúčeným" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../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:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Členovia" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +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:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "Značky({0} konfliktov)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, 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:104 +msgid "Nodes(resolved)" +msgstr "Body(vyriešené)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgid "" +"Merged node list frozen. No pending conflicts in the node list of this way" +msgstr "" +"Zmrazený zoznam spojovaných bodov. Vyriešené konflikty v zozname bodov v " +"tejto ceste." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +msgid "Nodes(with conflicts)" +msgstr "Body(v konflikte)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +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:113 +msgid "Members(resolved)" +msgstr "Členy(vyriešené)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +msgid "" +"Merged member list frozen. No pending conflicts in the member list of this " +"relation" +msgstr "" +"Zmrazený zoznam spojovaných členov. Vyriešené konflikty v zozname členov v " +"tejto relácii" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +msgid "Members(with conflicts)" +msgstr "Členy(v konflikte)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +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:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "Rozhodnutie konfliktov" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "aktuálny parameter je mimo rozsahu: got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "neočakávaná hodnota parametra\"index\". Got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "položka {0} sa v zozname nenachádza" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "zablokovať rolovanie" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "Porovnať " + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "Moja verzia" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "Spojovaná verzia" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" +"Zoznam spojovaných elementov. Budú nahradené mojimi elementmi, keď " +"rozhodnutie pre spojenie bude aplikované" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "Ich verzia" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "> hore" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "Kopírovať moje vybrané body na začiatok zoznamu pre spojované body" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "> dole" + +#: ../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 "" +"Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" +"Kopírovať moje vybrané elementy pred prvý vybraný element v zozname pre " +"spojované elementy" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" +"Kopírovať moje vybrané elementy za prvý vybraný element v zozname pre " +"spojované elementy" + +#: ../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írovať ich vybrané elementy na začiatok zoznamu pre spojované elementy" + +#: ../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 "" +"Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" +"Kopírovať ich vybrané elementy pred prvý vybraný element v zozname pre " +"spojované elementy" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" +"Kopírovať ich vybrané elementy za prvý vybraný element v zozname pre " +"spojované elementy" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "Hore" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "Dole" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Odstrániť" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "Blokovať" + +#: ../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 "Blokovať aktuálny zoznam spojovaných elementov" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +msgstr "Odblokovať" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 +msgid "Unfreeze the list of merged elements and start merging" +msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" +"Klik {0}pre začiatok spojovania mojich a ich " +"položiek" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" +"Klik {0}pre koniec spojovania mojich a ich položiek" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "Moja verzia ({0} vstupy)" +msgstr[1] "Moja verzia ({0} vstup)" +msgstr[2] "Moja verzia ({0} vstupov)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "Spojovaná verzia ({0} vstupy)" +msgstr[1] "Spojovaná verzia ({0} vstup)" +msgstr[2] "Spojovaná verzia ({0} vstupov)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "Ich verzia ({0} vstupy)" +msgstr[1] "Ich verzia ({0} vstup)" +msgstr[2] "Ich verzia ({0} vstupov)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" +"nastaviteľný {0} ešte neregistrovaný. Nie je možné nastaviť spoluúčasť v " +"nastavení synchronizácii" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "nastaviteľný {0} ešte neregistrovaný" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "Bod" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, 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/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Úloha" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "Pôvodný" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" +"spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "Spojovaná dátová sada nebude obsahovať značky s kľúčom {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "Moja dátová sada nebude obsahovať značky s kľúčom {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "nie je možné použiť neistú značku pri spojovaní prvkov" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "Parameter 'col' musí byť 0 alebo 1. Got {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "Moja verzia (miestna(local) dátova sada)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "Ich(their) verzia (serverová dátová 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 ">" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "Držať vybrané páry kľúče/hodnoty z miestnej(local) dátovej sady" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "Držať vybrané páry kľúče/hodnoty z dátovej sady servera" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "Nerozhodnuté" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "Symbol vybraných značiek je nerozhodnutý" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "Ich(their) dátová sada neobsahuje značku s kľúčom {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -2950,5 +3540,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2981,9 +3571,9 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Vyriešiť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -2991,25 +3581,73 @@ "v obsahu na vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Spojenie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got " + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Vyriešiť konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Riešiť konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "Rozhodnutie konfliktov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +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:164 +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:165 +msgid "Apply Resolution" +msgstr "Použiť rozhodnutie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "Použiť čiastočné rozhodnutie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "Pokračovanie rozhodnutia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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 "" +"Nemôžete ukončiť rozhodnutie pre všetky konflikty.
Kľuk {0}" +" použite už rovnako rozhodnuté konflikty.
Môžete rozhodnúť o " +"zostávajúcich konfliktoch neskôr.
Kľuk {1} pre návrat do " +"riešenia konfliktov." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Varovanie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3173,10 +3811,4 @@ msgid "Member Of" msgstr "Člen" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Úloha" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3354,9 +3986,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Occupied By" -msgstr "Zaneprázdnený" +msgstr "Využité (kým)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "linked" -msgstr "" +msgstr "zviazané" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:195 @@ -3364,8 +3996,4 @@ msgstr "Značky (prázdne hodnoty zmazaných značiek)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Členovia" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3399,11 +4027,4 @@ msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Odstrániť" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3458,5 +4079,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3481,5 +4102,5 @@ msgstr "áno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3506,24 +4127,24 @@ msgstr "nie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Členov: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relácie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Vznikli konflikty počas importu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Chyba parsovania odozvy servera" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Nemôžem sa pripojiť na server." @@ -3778,11 +4399,5 @@ #, java-format msgid "Image with path {0} does not exist or is not readable." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Varovanie" +msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 @@ -3823,5 +4438,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3859,53 +4474,53 @@ msgstr "Zadaný čas nemôže byť rozparsovaný" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps poloha bodu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Prispôsobiť kresliacu trasu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Použíť globálne nastavenie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Výber nastavenia kreslenej čiary" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Prispôsobiť farbu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3913,6 +4528,6 @@ msgstr "Predvolené" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3920,31 +4535,31 @@ msgstr "Zvoľte farbu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" -msgstr "Zvýrazňovač podľa pomenovania bodov" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +msgstr "Značky z pomenovaných bodov" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Pomenovanie trackpoints od {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importovať zvuk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave Audiosúbory (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" -msgstr "Audio značky z {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +msgstr "Zukové značky z {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importovať obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3954,5 +4569,5 @@ msgstr[2] "{0} stôp(track), " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3962,5 +4577,5 @@ msgstr[2] "{0} trás, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3970,28 +4585,28 @@ msgstr[2] "{0} waypointov (bodov cesty)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Meno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Časové rozpätie: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Dĺžka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Konvertovať do dátovej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -4002,11 +4617,11 @@ "chcete nahrať stopy (traces), pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4016,29 +4631,29 @@ msgstr "Prevedené z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" -msgstr "Stiahnuť z OSM podľa tejto stopy (track)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +msgstr "Stiahnuť z OSM okolie tejto stopy (track)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metrov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4049,9 +4664,9 @@ "
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4061,5 +4676,5 @@ "alebo za koncom, boli vynechané, alebo presunuté na začiatok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4078,24 +4693,24 @@ msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} zmazané.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4133,5 +4748,5 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4141,5 +4756,5 @@ msgstr[2] "stopy s {0} bodmi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4149,5 +4764,5 @@ msgstr[2] "{0} skladá sa z {1} stôp" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4211,5 +4826,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 msgid "No existing audio markers in this layer to offset from." -msgstr "Neexistujú zvukové značky v tejto vrstve to offset from." +msgstr "" +"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť " +"posunutie." #. Not close enough to track, or no audio marker found for some other reason @@ -4290,5 +4907,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Prosím vyberte riadok na odstránenie." @@ -4333,5 +4950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 msgid "Start of track (will always do this if no other markers available)." -msgstr "Začiatok stopy (použite toto vždy ak nie sú iné značky dostupné)" +msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46 @@ -4352,5 +4969,5 @@ "button icons." msgstr "" -"Umiestnite text vedľa zvukovej značky (a obrázok a web) takisto ako jeho " +"Umiestniť text vedľa zvukovej značky (a obrázok a web) takisto ako jeho " "ikony." @@ -4385,6 +5002,6 @@ "modified time of each audio WAV file imported." msgstr "" -"Vytvorenie zvukových značiek v pozícii, kde stopa zodpovedá zmenenému času " -"pre každé nahraté zvukové WAV súbory." +"Vytvorenie zvukových značiek na mieste, kde čas stopy zodpovedá času " +"uloženia každého zvukové WAV súboru." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92 @@ -5438,5 +6055,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213 msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Iba zujímavé smery (napr. jednosmerka)" +msgstr "Iba dôležité smery (napr. jednosmerka)" #. only on the head of a way @@ -5593,5 +6210,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "OSM Data" -msgstr "OSM Dáta" +msgstr "OSM údaje" #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21 @@ -5650,5 +6267,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Aktualizovať" @@ -5660,7 +6277,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Vložte buď site-josm.xml alebo wiki stránku" +msgid "Add JOSM Plugin description URL." +msgstr "Pridať JOSM Plugin popis URL." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5668,4 +6284,8 @@ msgid "Please select an entry." msgstr "Vyber prosím nejakú položku." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "Upraviť JOSM Plugin popis URL." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5772,5 +6392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41 msgid "OSM username (email)" -msgstr "OSM užívateľské meno (email)" +msgstr "OSM používateľské meno (email)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 @@ -6050,5 +6670,5 @@ msgstr "Neznány typ (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6059,15 +6679,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6078,18 +6698,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -6104,5 +6724,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:39 msgid "Contacting OSM Server..." -msgstr "Kontaktujem OSM Server..." +msgstr "Pripája sa na OSM Server..." #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 @@ -6115,5 +6735,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:50 msgid "Downloading OSM data..." -msgstr "Sťahujem OSM dáta..." +msgstr "Sťahujem OSM údaje..." #. SAXException does not chain correctly @@ -6127,11 +6747,58 @@ msgstr "Pripravujem dáta..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX súbory" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Značky z {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183 súbory" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Importované súradnice: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Poškodené údaje(vety): " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Chyby v kontrolnom súčte: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Neznáme údaje(vety): " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Nulové súradnice: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA import úspešný" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA import zlyhal!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." -msgstr "Táto verzia JOSMu je nekompatibilná s konfiguračným serverom." +msgstr "" +"Táto verzia JOSMu nie je kompatibilná s vybraný serverom uloženým v " +"nastaveniach." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 @@ -6188,4 +6855,13 @@ msgstr "Neznámy hostiteľ" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "OSM Serverové Súbory bzip2 zabalené" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "Poškodený bz2 súbor." + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6213,8 +6889,16 @@ msgstr "Prerušujem..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +msgstr "OSM Serverové Súbory gzip zbalené" + #: ../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 +msgid "OSM Server Files" +msgstr "Súbory OSM Servera" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6223,5 +6907,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161 msgid "Version number missing from OSM data" -msgstr "Chýba číslo verzie z OSM dát" +msgstr "Chýba číslo verzie z OSM údajov" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163 @@ -6245,20 +6929,20 @@ #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" +msgstr "Chýba atribút \"ref\" člena relácie {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -msgstr "" +msgstr "Neplatné hodnota atribútu \"ref\" člena relácie {0} (hodnota {1})" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" +msgstr "Chýba atribút \"type\" člena {0} relácie {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)." +msgstr "Neočakávaný \"type\" člena {0} relácie {1} (hodnota {2})" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6275,9 +6959,10 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" +"Neplatná hodnota atribútu \"version\" v OSM elemente s id {0} (hodnota {1})" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Chýba atribút \"version\" v OSM elemente s id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 @@ -6293,5 +6978,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485 msgid "Prepare OSM data..." -msgstr "Pripravujem OSM dáta..." +msgstr "Pripravujem OSM údaje..." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499 @@ -6304,5 +6989,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6310,4 +6995,7 @@ "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/io/OsmServerReader.java:85 @@ -6326,15 +7014,20 @@ "oblasť." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Aktualizácia pluginov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Stiahnuť pluginy" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6347,23 +7040,33 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Nemôžem stiahnuť plugin: {0} z {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "{0} Pluginy je úspešne stiahnuté. Prosím reštartujte JOSM." +msgstr[1] "{0} Plugin je úspešne stiahnutý. Prosím reštartujte JOSM." +msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "Sťahujem Pluginy {0}..." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť." +msgid "Skip download" +msgstr "Vynechať sťahovanie" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, 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:119 +msgid "Download Plugin" +msgstr "Stiahnuť Plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "Vynechať Sťahovanie" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6381,25 +7084,25 @@ "potrebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, 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 #, 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:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nenájdený: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6409,21 +7112,21 @@ "the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Vypnúť doplnok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Zachovať plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6433,5 +7136,5 @@ "ich prepísaniu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6440,10 +7143,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6451,38 +7154,39 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Vypnúť doplnok?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " "unload the plugin." msgstr "" -"Doplnok (plugin) bol odstránený z konfigurácie. Prosím reštartujte JOSM aby " -"sa prestal používať." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +"Doplnok (plugin) bol odstránený z nastavení. Prosím reštartujte JOSM aby sa " +"prestal používať." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " "about the problem." msgstr "" -"Doplnok sa nedal odstrániť. Prosím informuj o tomto probléme vývojárov JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +"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:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informácia" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "Popis nedostupný" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +msgstr "Viac detailov" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6492,13 +7196,13 @@ msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Nenájdené informácie o plugine" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 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:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6511,9 +7215,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Stiahnuť chýbajúca pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6526,10 +7230,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Stiahnuť pluginy" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6552,41 +7252,14 @@ msgstr "neznámy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verzie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Plugin je zahrnutý v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Plugin už existuje" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" -"Plugin (archív .jar) je už dostupný. Chcete stiahnuť aktuálnu verziu a " -"prepísať ňou existujúci súbor (archív .jar)\n" -"\n" -"{0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Vymazať a Nahrať" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Chyba pri mazaní súboru pluginu: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6618,6 +7291,6 @@ "V programe sa vyskytla chyba.\n" "\n" -"Ak používate najnovšiu verziu JOSM, buďte taký dobrý a odošlite (vložte do " -"databázy chýb) správu." +"Ak používate najnovšiu verziu JOSM, zvážte vyplnenie a odoslanie hlásenia o " +"chybe." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 @@ -6738,9 +7411,4 @@ msgstr "Prosím zapíšte popis a vašej stope(trace)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Značky" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6912,4 +7580,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Chyba pri rozkladaní {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7143,6 +7816,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" @@ -7218,5 +7891,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." -msgstr "Nahradiť originálne pozadie s farbou JOSM pozadia." +msgstr "Nahradiť pôvodné pozadie farbou JOSM pozadia." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 @@ -7273,6 +7946,6 @@ "preferences." msgstr "" -"Nahradiť originálne biele pozadie, farbou pozadia definovanou v nastaveniach " -"JOSMu." +"Nahradiť pôvodné biele pozadie, farbou pozadia definovanou v nastaveniach " +"JOSM." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 @@ -7418,5 +8091,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38 msgid "Open a layer first (GPX, OSM, cache)" -msgstr "Otvoriť nejakú vrstvu, najskôr (GPX, OSM, cache)" +msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 @@ -7480,37 +8153,42 @@ "Najskôr vyberte jednu z nich a potom zopakujte" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Prázdna vrstva" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Nie je vektorizované." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Stred rastra: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Je vektorizované." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "Hranice obce bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "Uložiť WMS vrstvu" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7519,16 +8197,21 @@ msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "Načítať WMS vrstvu" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7539,9 +8222,9 @@ "Vytvorte nový súbor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Cache chýb formátov" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -7549,5 +8232,5 @@ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "Cache chýb v Lambert Zóne" @@ -7588,11 +8271,10 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Rozdeliť cestu" +msgstr "Rozdeliť oblasť" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Rozdeliť oblasť podľa neoznačenej cesty" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -7602,4 +8284,6 @@ "Remove the area from the relation before splitting it." msgstr "" +"Zvolená oblasť nemôže byť rozdelená, pretože je členom relácie.\n" +"Odstráňte oblasť z relácie pred jej rozdelením." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8022,7 +8706,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "voda" @@ -8417,16 +9101,21 @@ msgstr "Neznámy stav problému" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Otvoriť pohľad..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Neznámy typ súboru: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8517,5 +9206,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8542,25 +9231,25 @@ msgstr "Otvoriť zoznam trasových bodov" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "Pridať routing layer" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Kritérium" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Najkratšia" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Najrýchlejšia" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Opačná trasa" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Vymazať trasu" @@ -8735,11 +9424,11 @@ msgstr "koniec (end)" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" msgstr "Upraviť značky" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "Otvoriť dialóg úpravy značiek" @@ -8749,8 +9438,4 @@ msgstr "JOSM Tag Editor Plugin (plugin pre úpravu značiek)" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "(žiadny)" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8761,5 +9446,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8769,5 +9454,5 @@ msgstr[2] "Odstrániť staré kľúče z {0} objektov" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8790,8 +9475,14 @@ msgstr "Filter" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Vyčistiť" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "neočakávané číslo stĺpca {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9153,5 +9844,6 @@ "programs." msgstr "" -"Kontrolór OSM dát, hľadajúci bežné chyby urobené užívateľmi a programami." +"Kontrolór OSM údajov, hľadajúci najčastejšie chyby urobené užívateľmi a " +"programami." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -9706,7 +10398,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "budovy" @@ -9720,5 +10412,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "oblasť(plocha)" @@ -9811,4 +10503,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "Vybrať a spustiť body na konci cesty" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "Je dosiahnuté spojenie" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9909,19 +10617,19 @@ "Môže to viesť k zlým súradniciam." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatické sťahovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9929,17 +10637,17 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alfa kanál" @@ -9953,53 +10661,53 @@ msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Nastavenie WMS Pluginu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Meno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Meno v menu (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS URL (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Zadajte meno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Skopírovať východzí" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Vyberte riadok na kopírovanie." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "Prekryť štvorce (tiles)" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" -msgstr "" +msgid "% of lat:" +msgstr "% lat:" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" -msgstr "" +msgstr "% lon:" #. * @@ -10026,6 +10734,7 @@ "request a smaller area, or use planet.osm" msgstr "" -"Maximálna veľkosť bbox je 0.25, a vaša požiadavka bola príliš veľká. " -"Vyžiadajte si menšiu oblasť, alebo použite planet.osm" +"Požiadavka na stiahnutie údajov bola príliš veľká, presiahla maximálny " +"veľkosť oblasti bbox je 0.25. Vyžiadajte si menšiu oblasť, alebo použite " +"planet.osm" #. OSM server message @@ -10077,5 +10786,5 @@ msgid "" "Creating and handling address nodes and buildings within Czech Republic." -msgstr "" +msgstr "Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky." #. Plugin DirectUpload @@ -10096,11 +10805,9 @@ #: build/trans_plugins.java:17 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á vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). Tento " -"plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM eg. " -"vymazaním nezaujímavých častí stopy (track)" +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." +msgstr "" +"Dovoliť užívateľovi anonymize časovú značku a zmazať časť z obrovskej GPX " +"stopy veľmi rýchlo." #. Plugin globalsat @@ -10222,5 +10929,5 @@ #: build/trans_plugins.java:51 msgid "Allow adding markers/nodes on current gps positions." -msgstr "Doviliť pridať značky/bodoy na aktuálnej gps pozícii." +msgstr "Povoliť pridávani značiek/bodov na aktuálnu gps pozíciu." #. Plugin tageditor @@ -10279,6 +10986,12 @@ "jednotný pre názvy značiek." +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" +"Jednoduché sťahovanie pozdĺž dlhej spojenej(set of interconnected) cesty" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11098,5 +11811,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "private (len pre vlastníka)" @@ -11144,5 +11857,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "miesto určenia (cieľ)" @@ -11179,5 +11892,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "permissive (súhlas vlastníka pozemku)" @@ -11409,6 +12122,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "dialnica (motorway)" @@ -11434,6 +12147,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "cesta pre motorové vozidlá (trunk)" @@ -11459,6 +12172,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "cesta prvej triedy" @@ -11484,6 +12197,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "cesta druhej triedy" @@ -11497,5 +12210,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "cesta tretej triedy" @@ -11513,5 +12226,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "obytná (osídlená)" @@ -11529,5 +12242,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "obslužná (service)" @@ -11554,6 +12267,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "konštrukcia" @@ -11603,5 +12316,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "kruhový objazd (roundabout)" @@ -12587,5 +13300,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "močiar (marsh)" @@ -14310,27 +15023,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "šport" @@ -15637,5 +16350,5 @@ #: build/trans_presets.java:2267 msgid "Power Station" -msgstr "Elektráreň" +msgstr "Transformátorová stanica" #. item @@ -15644,10 +16357,10 @@ #: build/trans_presets.java:2270 msgid "Edit Power Station" -msgstr "Upraviť elektráreň" +msgstr "Upraviť trafostanicu" #. item "Man Made/Power Station" text "Operator" #: build/trans_presets.java:2274 msgid "Power Sub Station" -msgstr "Podzemná elektráreň" +msgstr "Malý transformátor" #. item @@ -15656,5 +16369,5 @@ #: build/trans_presets.java:2277 msgid "Edit Power Sub Station" -msgstr "Upraviť podzemnú elektráreň" +msgstr "Upraviť malý transformátor" #. item "Man Made/Power Sub Station" text "Operator" @@ -15667,5 +16380,5 @@ #: build/trans_presets.java:2282 msgid "Power Tower" -msgstr "Vežová solárna elektráreň" +msgstr "Elektrický stožiar (vysoké napätie)" #. item @@ -15676,5 +16389,5 @@ #: build/trans_presets.java:2287 msgid "Edit Power Tower" -msgstr "Upraviť vežovú solárnu elektráreň" +msgstr "Upraviť elektrický stožiar" #. item "Man Made/Power Tower" label "Edit Power Tower" @@ -16506,5 +17219,5 @@ #: build/trans_presets.java:2661 msgid "Hamlet" -msgstr "Malá dedina" +msgstr "Malá dedina / osada / samota" #. item @@ -16879,5 +17592,5 @@ #: build/trans_presets.java:2876 msgid "Graveyard" -msgstr "Cintorín" +msgstr "Cintorín (malý, blizko kostola)" #. item @@ -16885,5 +17598,5 @@ #: build/trans_presets.java:2878 msgid "Edit Graveyard" -msgstr "Upraviť cintorín" +msgstr "Upraviť cintorín (malý, blizko kostola)" #: build/trans_presets.java:2884 @@ -17173,8 +17886,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bicykel" @@ -17235,6 +17948,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17245,8 +17956,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "pešia (foot)" @@ -17272,5 +17983,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro (subway)" @@ -17355,4 +18066,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17367,8 +18079,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17388,5 +18102,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "štandartný" @@ -17476,7 +18190,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "most" @@ -17740,15 +18454,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "zastaralý" @@ -17790,5 +18504,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "koňská (horse)" @@ -17998,11 +18712,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "prekážka" @@ -18040,6 +18754,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "ulica" @@ -18095,7 +18809,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "cesta (highway_track)" @@ -18151,8 +18865,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "koľajnica (rail)" @@ -18173,5 +18887,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "služby" @@ -18185,5 +18899,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "brod" @@ -18204,5 +18918,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" @@ -18217,5 +18931,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "miesto pohotovostnej prvej pomoci" @@ -18230,5 +18944,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "riečny breh" @@ -18242,5 +18956,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "potok" @@ -18254,5 +18968,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "dok (nakladacia rampa)" @@ -18280,5 +18994,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "akvadukt" @@ -18446,13 +19160,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "človekom vytvorené (manmade)" @@ -18514,7 +19228,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "železničná výhybka" @@ -18537,10 +19251,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "iná koľaj" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "nadchod nad železnicou" @@ -18570,6 +19284,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "historická železnica(turistická)" @@ -18614,6 +19328,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "letecké cesty" @@ -18627,5 +19341,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminál" @@ -18647,5 +19361,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "zjazdovka_čierna" @@ -18659,5 +19373,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "zjazdovka_ľahká" @@ -18705,7 +19419,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "Visuté cesty/Lanovky" @@ -18722,5 +19436,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "mierna zjazdovka (piste_easy)" @@ -18735,5 +19449,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "stredne ťažká zjazdovka (piste_intermediate)" @@ -18748,5 +19462,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "zjazdovka pre pokročilých (piste_advanced)" @@ -18761,5 +19475,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "zjazdovka pre expertov (piste_expert)" @@ -18774,5 +19488,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "zjazdovka pre freeride (piste_freeride)" @@ -18787,5 +19501,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "zjazdovka pre začiatočníkov (piste_novice)" @@ -18890,10 +19604,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "energia (power)" @@ -18906,8 +19620,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "hrádza (pier)" @@ -18921,5 +19633,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "potrubie (pipeline)" @@ -19047,12 +19759,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "oddych (leisure)" @@ -19066,5 +19778,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "prístav (marina)" @@ -19136,8 +19848,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "zaujímavosti (amenity)" @@ -19239,10 +19951,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "verejná_doprava" @@ -19628,22 +20340,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "svetelné zariadenie" @@ -19675,6 +20387,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "osvetlená_voda (light_water)" @@ -19735,8 +20447,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "zdravie" @@ -20089,26 +20801,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "obchod" @@ -20180,8 +20892,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20331,9 +21043,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "cestovanie" @@ -20405,8 +21117,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historické" @@ -20477,8 +21189,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "zelená" @@ -20492,5 +21204,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "lom" @@ -20504,5 +21216,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "skládka odpadov (landfill)" @@ -20524,5 +21236,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody" @@ -20536,5 +21248,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "les" @@ -20548,5 +21260,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "farmy" @@ -20569,5 +21281,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "maloobchody" @@ -20581,5 +21293,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "závody" @@ -20593,5 +21305,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "brownfield (opustený priemyselný objekt)" @@ -20605,5 +21317,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)" @@ -20617,5 +21329,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "železničný pozemok" @@ -20672,7 +21384,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "armáda" @@ -20686,5 +21398,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "cintorín (cemetery)" @@ -20697,5 +21409,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "vrchol (peak)" @@ -20710,5 +21422,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "ľadovec (glacier)" @@ -20722,5 +21434,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "sopka" @@ -20775,8 +21487,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "prírodné (natural)" @@ -20790,5 +21502,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "oblasť pokrytá krovím" @@ -20802,5 +21514,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "vresovisko" @@ -20814,5 +21526,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "drevo (wood)" @@ -20826,5 +21538,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "blato (mud)" @@ -20838,5 +21550,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "pláž (beach)" @@ -20914,8 +21626,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "trasa (route)" @@ -20963,7 +21675,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "hranica (boundary)" @@ -21105,10 +21817,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "miesto" @@ -21156,6 +21868,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adresa" @@ -21386,10 +22098,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21437,4 +22149,33 @@ msgstr "Ulice NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +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 "Terraserver Urban" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Vložte buď site-josm.xml alebo wiki stránku" + +#~ 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 "Navigation" +#~ msgstr "Navigácia" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21444,10 +22185,4 @@ #~ "tlačítko myši a hýbte myšou. Výber: Kľuk." -#~ msgid "Commit comment" -#~ msgstr "Poslať komentár" - -#~ msgid "Navigation" -#~ msgstr "Navigácia" - #~ msgid "Charge" #~ msgstr "Poplatok" @@ -21459,4 +22194,13 @@ #~ 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 "Drawbridge" #~ msgstr "Padací most" @@ -21468,4 +22212,22 @@ #~ msgstr "Mreže" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky " +#~ "stiahnuť." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Plugin (archív .jar) je už dostupný. Chcete stiahnuť aktuálnu verziu a " +#~ "prepísať ňou existujúci súbor (archív .jar)\n" +#~ "\n" +#~ "{0}" + #~ msgid "viaduct" #~ msgstr "viadukt (nadjazd)" @@ -21474,4 +22236,7 @@ #~ msgstr "Športový" +#~ msgid "Delete and Download" +#~ msgstr "Vymazať a Nahrať" + #~ msgid "Edit Drawbridge" #~ msgstr "Upraviť padací most" @@ -21480,4 +22245,13 @@ #~ msgstr "Upraviť mreže" +#~ 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á vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). " +#~ "Tento plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM " +#~ "eg. vymazaním nezaujímavých častí stopy (track)" + #~ msgid "Remove route nodes" #~ msgstr "Odstrániť trasové body" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 15801) +++ /applications/editors/josm/i18n/po/sl.po (revision 15802) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:31+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:45+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,8 +17,8 @@ "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-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -26,16 +26,16 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Pomoč" -#: ../core/src/org/openstreetmap/josm/Main.java:259 +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:347 +#: ../core/src/org/openstreetmap/josm/Main.java:349 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -43,52 +43,54 @@ "strežnik." -#: ../core/src/org/openstreetmap/josm/Main.java:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Neshranjene spremembe" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -96,5 +98,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -103,10 +105,10 @@ msgstr "Prekliči" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -190,5 +192,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Vstavki" @@ -255,15 +257,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Razporedi vozliša v krog" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -272,8 +274,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -294,9 +297,9 @@ msgstr "Orodje: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Prosim, izberite vsaj 4 vozlišča." @@ -331,5 +334,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -469,5 +472,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -478,7 +481,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Izbriši" @@ -488,14 +491,15 @@ msgstr "Izbriši izbrane predmete." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Prepiši" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Datoteka obstaja. Jo nadomestim?" @@ -523,9 +527,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -563,16 +567,4 @@ msgstr "Zaključek dela z aplikacijo." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -644,12 +636,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -657,5 +649,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Napaka" @@ -676,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -785,4 +777,18 @@ msgstr "Združi {0} vozlišč" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -839,67 +845,25 @@ msgstr "neimenovano" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Odpri ..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Odpri datoteko." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Napaka pri razčlenjevanju {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Neznana končnica datoteke: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "" - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -970,5 +934,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Prilepi" @@ -997,5 +961,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Nastavitve" @@ -1041,14 +1005,19 @@ msgstr "Obrni smer poti" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Shrani" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Shrani trenutne podatke" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1056,26 +1025,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 msgid "No document open so nothing to save." msgstr "Dokument ni odprt, zato ni kaj shraniti." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Prazen dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "V sporu z" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1083,32 +1052,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Shrani datoteko OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Shrani datoteko GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Shrani datoteko OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Neznana končnica datoteke." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "" @@ -1238,56 +1211,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "The current selection cannot be used for unglueing." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" +msgid "* One node that is used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:118 -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:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1297,9 +1270,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1307,5 +1280,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1363,50 +1336,50 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Pošlji v OSM ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 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:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Novi predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Spremenjeni predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Izbrisani predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Pošljem te spremembe?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1610,14 +1583,14 @@ msgstr "Dodaj in poveži vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 +msgid "Select node under cursor." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 #, java-format msgid "Insert new node into way." @@ -1626,14 +1599,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "" @@ -1653,5 +1626,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." @@ -1662,5 +1635,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." @@ -1695,5 +1668,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1702,5 +1675,5 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1723,16 +1696,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1740,145 +1713,155 @@ msgstr "Ni naloženih podatkov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "foot: - key=foot set to any value." -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "Special targets:" +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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1892,14 +1875,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "" @@ -1935,7 +1948,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Dodaj" @@ -1977,4 +1990,8 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -1982,60 +1999,10 @@ msgstr "Razreši {0} sporov v {1} predmetih" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Izbriši {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Izbriši {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Premakni" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2049,167 +2016,21 @@ msgstr[3] "vozlišča" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Zasuk" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Zaporedje" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Uveljavim?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Uveljavi izbrane spremembe" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Ne uveljavi sprememb" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95 -msgid "Properties of " -msgstr "Lastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Samodejno popravljanje oznak" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, 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:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "različno" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "izbrisano" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "pravilno" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "napačno" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "položaj" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Decimalne stopinje" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Stopinje Minute Sekunde" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "J" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "Z" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "nepopoln" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Napaka: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Opozorilo: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "poti" +msgstr[1] "pot" +msgstr[2] "poti" +msgstr[3] "poti" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2223,4 +2044,257 @@ msgstr[3] "relacije" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Izbriši {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Izbriši {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Premakni" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Zasuk" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Zaporedje" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Uveljavim?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "različno" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "izbrisano" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "pravilno" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "napačno" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "položaj" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Decimalne stopinje" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Stopinje Minute Sekunde" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "J" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "Z" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "nepopoln" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Napaka: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Opozorilo: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2259,140 +2333,129 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -msgid "Empty member in relation." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +msgid "Empty member in relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznana vloga ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "besedilo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "poti" -msgstr[1] "pot" -msgstr[2] "poti" -msgstr[3] "poti" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2414,5 +2477,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2483,4 +2546,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2495,4 +2559,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2697,26 +2762,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2725,21 +2790,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Zvok" @@ -2849,4 +2914,493 @@ msgstr "" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Oznake" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Člani" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Odstrani" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Vloga" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2860,5 +3414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2889,32 +3443,76 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Razreši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Spor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Spori pri zlivanju" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Razreši spore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" msgstr "" @@ -3079,10 +3677,4 @@ msgid "Member Of" msgstr "" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Vloga" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3266,8 +3858,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Člani" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3301,11 +3889,4 @@ msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Odstrani" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3360,5 +3941,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3383,5 +3964,5 @@ msgstr "da" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3408,24 +3989,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Člani: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "" @@ -3681,10 +4262,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3725,5 +4300,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3761,53 +4336,53 @@ msgstr "Vpisanega časa ni bilo mogoče razpoznati." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 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 +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 +msgid "Use global settings." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 -msgid "Customize line drawing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 -msgid "Use global settings." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Ne riši povezav med točkami na tej plasti." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Prilagodi barvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../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:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3815,6 +4390,6 @@ msgstr "Privzeto" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3822,31 +4397,31 @@ msgstr "Izberite barvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Uvozi zvok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Zvočne datoteke (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Uvozi slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3855,5 +4430,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3862,5 +4437,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3869,28 +4444,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Opis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3899,11 +4474,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3913,29 +4488,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3946,9 +4521,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3956,5 +4531,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3971,24 +4546,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} izbrisan.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4028,5 +4603,5 @@ msgstr[3] "točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4037,5 +4612,5 @@ msgstr[3] "sled z {0} točkami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4044,5 +4619,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4177,5 +4752,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Prosim izberite vrstico za izbris." @@ -5511,5 +6086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Posodobi" @@ -5521,6 +6096,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." +msgid "Add JOSM Plugin description URL." msgstr "" @@ -5528,4 +6102,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." msgstr "" @@ -5886,5 +6464,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5895,15 +6473,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5915,18 +6493,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -5964,6 +6542,51 @@ msgstr "Pripravljam podatke..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +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/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "" + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" msgstr "" @@ -6022,4 +6645,13 @@ msgid "Unknown host" msgstr "Neznan gostitelj" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6048,8 +6680,16 @@ msgstr "Prekinjanje ..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6139,5 +6779,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6159,15 +6799,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Posodobitev vstavkov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6180,24 +6825,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -msgid "{0} Plugin successfully updated. Please restart JOSM." -msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM." -msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM." -msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM." -msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -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 "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6213,25 +6866,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Vstavek zahteva posodobitev programa JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Vstavka {0} ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6241,21 +6894,21 @@ "možnosti 'pluginmanager.warntime' v nastavitvah.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Onemogoči vstavek" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6265,5 +6918,5 @@ "prepisati obstoječe datoteke." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6272,10 +6925,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6283,9 +6936,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Naj vstavek onemogočim?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6295,5 +6948,5 @@ "njegovo odstranitev iz spomina." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6303,19 +6956,19 @@ "dobili JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Informacije" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "opis ni na voljo" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6326,13 +6979,13 @@ msgstr[3] "Sprejeti podatki o vstavkih z {0} strežnikov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Informacij o vsavku ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Vsi nameščeni vstavki so posodobljeni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6345,9 +6998,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Sprejem manjkajočih vstavkov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6360,10 +7013,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6386,37 +7035,14 @@ msgstr "neznan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Različica {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Vstavek že obstaja" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -msgid "" -"Plugin archive already available. Do you want to download the current " -"version by deleting existing archive?\n" -"\n" -"{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Napaka pri brisanju datoteke vstavka: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6558,9 +7184,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Oznake" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6728,4 +7349,9 @@ msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#, java-format +msgid "Error while parsing {0}" +msgstr "Napaka pri razčlenjevanju {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -6947,6 +7573,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -7263,37 +7889,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Prazna plast" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7302,16 +7933,21 @@ msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7320,14 +7956,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7368,7 +8004,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Potok" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7799,7 +8434,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "" @@ -8177,16 +8812,21 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Odpri vidne ..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 msgid "No view open - cannot determine boundaries!" msgstr "" + +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Neznana končnica datoteke: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8273,5 +8913,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8298,25 +8938,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8489,11 +9129,11 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8503,8 +9143,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8515,5 +9151,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8522,5 +9158,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8542,7 +9178,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9430,7 +10072,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "zgradba" @@ -9444,5 +10086,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "" @@ -9532,4 +10174,20 @@ #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" msgstr "" @@ -9606,36 +10264,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Samodejno sprejemanje" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9649,51 +10307,51 @@ msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Nastavitve WMS vstavka" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Naziv v meniju" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Povezava do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Vpišite ime za meni in povezavo do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9779,7 +10437,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -9929,6 +10586,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10746,5 +11408,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "" @@ -10792,5 +11454,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "" @@ -10827,5 +11489,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "" @@ -11057,6 +11719,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "" @@ -11082,6 +11744,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "hitra cesta" @@ -11107,6 +11769,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "glavna" @@ -11132,6 +11794,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "regionalna" @@ -11145,5 +11807,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "regionalna (turistična)" @@ -11161,5 +11823,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "" @@ -11177,5 +11839,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "" @@ -11202,6 +11864,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "" @@ -11251,5 +11913,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "krožišče" @@ -12228,5 +12890,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "" @@ -13950,27 +14612,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "šport" @@ -16808,8 +17470,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "" @@ -16870,6 +17532,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16880,8 +17540,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "" @@ -16907,5 +17567,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "" @@ -16990,4 +17650,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17002,8 +17663,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17023,5 +17686,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17111,7 +17774,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "" @@ -17375,15 +18038,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "" @@ -17425,5 +18088,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "" @@ -17633,11 +18296,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17675,6 +18338,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "" @@ -17730,7 +18393,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "" @@ -17786,8 +18449,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "" @@ -17808,5 +18471,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17820,5 +18483,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17839,5 +18502,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "" @@ -17852,5 +18515,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17865,5 +18528,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "" @@ -17877,5 +18540,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "" @@ -17889,5 +18552,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "" @@ -17915,5 +18578,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "" @@ -18081,13 +18744,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "" @@ -18149,7 +18812,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "" @@ -18172,10 +18835,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18205,6 +18868,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18249,6 +18912,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18262,5 +18925,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "" @@ -18282,5 +18945,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18294,5 +18957,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18340,7 +19003,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "" @@ -18357,5 +19020,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18370,5 +19033,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18383,5 +19046,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18396,5 +19059,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18409,5 +19072,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18422,5 +19085,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18525,10 +19188,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "" @@ -18541,8 +19204,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "" @@ -18556,5 +19217,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "" @@ -18682,12 +19343,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "" @@ -18701,5 +19362,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18771,8 +19432,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "" @@ -18874,10 +19535,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "" @@ -19263,22 +19924,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19310,6 +19971,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19370,8 +20031,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "" @@ -19724,26 +20385,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "" @@ -19815,8 +20476,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "" @@ -19966,9 +20627,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "" @@ -20040,8 +20701,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "" @@ -20112,8 +20773,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20127,5 +20788,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "" @@ -20139,5 +20800,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20159,5 +20820,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "" @@ -20171,5 +20832,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "" @@ -20183,5 +20844,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20204,5 +20865,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "" @@ -20216,5 +20877,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "" @@ -20228,5 +20889,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20240,5 +20901,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20252,5 +20913,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20307,7 +20968,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "" @@ -20321,5 +20982,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "" @@ -20332,5 +20993,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "" @@ -20345,5 +21006,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "" @@ -20357,5 +21018,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "" @@ -20410,8 +21071,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "" @@ -20425,5 +21086,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "" @@ -20437,5 +21098,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "" @@ -20449,5 +21110,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "" @@ -20461,5 +21122,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "" @@ -20473,5 +21134,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "" @@ -20549,8 +21210,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "" @@ -20598,7 +21259,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "" @@ -20740,10 +21401,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "" @@ -20791,6 +21452,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "" @@ -21021,10 +21682,10 @@ msgstr "" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21072,4 +21733,25 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM." +#~ msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM." +#~ msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM." +#~ msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21082,4 +21764,20 @@ #~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):" +#~ 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 "" +#~ "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 "Edit Portcullis" #~ msgstr "Uredi dók" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 15801) +++ /applications/editors/josm/i18n/po/sv.po (revision 15802) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:39+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-06-07 12:53+0000\n" +"Last-Translator: nanker \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:15+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -25,69 +25,70 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:259 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" -msgstr "Projektion kunde ej läsas från inställningarna. Använde rEPSG:4326" - -#: ../core/src/org/openstreetmap/josm/Main.java:347 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Osparade ändringar" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "Spara och avsluta" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "Kassera och avsluta" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +96,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +103,10 @@ msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Insticksmoduler" @@ -254,15 +255,15 @@ msgstr "Longitud" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Bilda en cirkel av noderna" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +272,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -291,11 +293,11 @@ #, java-format msgid "Tool: {0}" -msgstr "Vertyg: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +msgstr "Verktyg: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "Några av noderna befinner sig (nästan) på linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Välj åtminstone fyra noder." @@ -330,5 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "konflikt" @@ -436,5 +438,5 @@ "nodes)" msgstr "" -"Kunde inte slå ihop sträckorna (Det går inte att göra en enda sekvens av " +"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av " "noder av dem)" @@ -475,5 +477,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -484,7 +486,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Ta bort" @@ -494,14 +496,15 @@ msgstr "Ta bort valda objekt." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Skriv över" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Filen existerar redan. Vill du skriva över?" @@ -529,9 +532,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -569,16 +572,4 @@ msgstr "Avsluta programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "OSM serverfiler" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "GPX-filer" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "NMEA-0183-filer" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -652,12 +643,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -665,5 +656,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Fel" @@ -684,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -716,5 +707,5 @@ #, java-format msgid "Helppage missing. Create it in english." -msgstr "Själpsida saknas. Skapa den på engelska." +msgstr "Hjälpsida saknas. Skapa den på engelska." #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212 @@ -724,5 +715,5 @@ "\">your language." msgstr "" -"Hjälpsida saknas. Skaa den på engelska eller engelska eller ditt språk." @@ -799,4 +790,18 @@ msgid "Merge {0} nodes" msgstr "Slå ihop {0} noder" + +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -854,67 +859,25 @@ msgstr "namnlös" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Öppna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Öppna en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fel vid tolkning {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Okänt filformat: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "Markörer från {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "Koordinater importerade: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Felaktigt utformade meningar: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Checksum-fel: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Okända meningar: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Nollkoordinater: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "Import från NMEA genomförd" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "Import från NMEA misslyckades!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -989,5 +952,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Klistra in" @@ -1018,5 +981,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Inställningar" @@ -1062,14 +1025,19 @@ msgstr "Ändra riktning på sträckor" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Spara" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Spara nuvarande data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1079,27 +1047,27 @@ "in detta som ett fel." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "Dokumentet innehåller inte någon data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "Spara i alla fall" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1109,32 +1077,36 @@ "som om du avvisat dem alla. Fortsätt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "Avvisa konflikter och spara" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "Spara OSM-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "Spara GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "Spara OSM-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Kunde inte backa upp filen." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Okänd filändelse." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Det uppstod ett fel när filen skulle sparas." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Det uppstod ett fel när backup-filen skulle återställas." @@ -1274,55 +1246,55 @@ msgstr "Byter läge för den globala inställningen ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Frigör sträckor" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicera noder som används av flera olika sträckor." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "* One tagged node, or" msgstr "* En nod med tagg, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 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 +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 -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" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* En sträcka som har en eller flera noder som används av mer än en sträcka, " +"eller" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* En sträcka som har en eller flera noder som används av mer än en sträcka, " -"eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" @@ -1330,5 +1302,5 @@ "sträcka." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1343,9 +1315,9 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "Frigjord nod" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1353,5 +1325,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1412,50 +1384,50 @@ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "Skicka in till OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 msgid "Upload all changes to the OSM server." msgstr "Skicka in alla ändringar till OSM-servern." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Nya objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Ändrade objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Borttagna objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Skicka in dessa ändringar?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "Skicka in ändringar" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Det finns inte några ändringar att skicka in." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1569,5 +1541,5 @@ #, java-format msgid "Data Layer {0}" -msgstr "Data Lager {0}" +msgstr "Datalager {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83 @@ -1661,14 +1633,14 @@ msgstr "Lägg till en nod i en sträcka och bind ihop" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "Skapa ny nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 msgid "Select node under cursor." msgstr "Markera nod under pekare." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 #, java-format msgid "Insert new node into way." @@ -1677,14 +1649,14 @@ msgstr[1] "Infoga ny nod i {0} vägar." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +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:901 -msgid "Start new way from last node." -msgstr "Börja ny väg från senaste nod." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "Fortsätt väg från senaste nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "Avsluta ritning." @@ -1704,5 +1676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Släpp musknappen för att välja objekten i rektangeln." @@ -1713,5 +1685,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Släpp musknappen för att sluta rotera." @@ -1748,5 +1720,5 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1755,5 +1727,5 @@ "nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1780,16 +1752,16 @@ "ned, höger; flytta karta med högerknappen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1797,29 +1769,29 @@ msgstr "Ingen data har lästs in." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -1827,5 +1799,5 @@ "värde som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" @@ -1833,21 +1805,31 @@ "som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 +#: ../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:85 +#: ../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:86 +#: ../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:87 +#: ../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:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "" "type: - type of the object (node, way, relation)" @@ -1856,47 +1838,47 @@ "relation för relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "untagged - all untagged objects" -msgstr "otaggade - alal otaggede objekt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +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:97 +#: ../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:98 +#: ../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:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -1904,46 +1886,46 @@ "innehåller :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../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:108 +#: ../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:110 +#: ../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:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "" @@ -1961,15 +1943,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -2004,7 +2016,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lägg till" @@ -2044,4 +2056,8 @@ msgstr "Sätt {0}={1} för {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2049,65 +2065,10 @@ msgstr "Jämka {0} konflikter i {1} objekt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Ta bort {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Ta bort {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "Relationskonflikt" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "Ta bort från relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Flytta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2119,169 +2080,19 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "TaBortRelationsMedlem" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Rotera" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Tillämpa?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Verkställ valda ändringar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Verkställ inte ändringar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Egenskaper för " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Automatisk taggrättning" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Fel i configurationsfilen på raderna {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan inte öppna inställningsmappen: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "olik" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "raderad" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "sann" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "falsk" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "position" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Decimalgrader" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Grader Minuter Sekunder" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "S" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "N" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "V" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "Ö" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "ofullständig" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Fel: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Varning: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "sträcka" +msgstr[1] "sträckor" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2293,4 +2104,264 @@ msgstr[1] "relationer" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Ta bort {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Ta bort {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "Relationskonflikt" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Flytta" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "TaBortRelationsMedlem" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Rotera" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Tillämpa?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "olik" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "raderad" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "sann" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "falsk" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "position" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Decimalgrader" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Grader Minuter Sekunder" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "V" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "Ö" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "ofullständig" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Fel: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Varning: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2325,138 +2396,129 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "En sträcka för en yta är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygonsträckan ''{0}'' är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "Tom medlem i relationen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Tog bort medlemmen ''{0}'' i relationen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Sträcka \"{0} med mindre än två punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "Det finns mer än en \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "Det finns mer än en \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "Mer än en \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "Okänd roll ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Okänd medlemstyp för ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "Det finns inte någon \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "Det finns inte någon \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "Ingen nod eller sträcka för \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "Stil för restriktion {0} kunde inte hittas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Icke-sträcka ''{0}'' i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonen ''{0}'' saknar yttre sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Den inre sträckan ''{0}'' befinner sig utanför." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stil för yttre väg ''{0}'' passar inte." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "otaggade" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "sträcka" -msgstr[1] "sträckor" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2478,5 +2540,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2503,5 +2565,5 @@ "för latituder mellan 46,1° och 57°.\n" "Använd ett annat projektionsystem om du\n" -"inte använder en franska WMS-server.\n" +"inte använder en fransk WMS-server.\n" "Skicka inte in några data efter du har fått detta meddelande." @@ -2557,4 +2619,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2569,4 +2632,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2778,26 +2842,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2806,21 +2870,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Växla trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "Fullskärm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "Växla mellan fullskärmsläge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Ljud" @@ -2930,4 +2994,493 @@ msgstr "Initierar" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "Taggar" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Medlemmar" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Ta bort" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Roll" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2941,5 +3494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2970,34 +3523,78 @@ msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Jämka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Jämkar konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "Jämka konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Konflikter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Varning" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3159,10 +3756,4 @@ msgid "Member Of" msgstr "Medlem av" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Roll" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3348,8 +3939,4 @@ msgstr "Taggar (tomt värde tar bort taggen)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Medlemmar" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3383,11 +3970,4 @@ 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:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Ta bort" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3442,5 +4022,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3465,5 +4045,5 @@ msgstr "ja" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3490,24 +4070,24 @@ msgstr "nej" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Medlemmar: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "Relationsredigerare:{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "Konflikter upptäcktes under import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Fel vid inläsning av serverns svar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Kan inte ansluta till server." @@ -3764,10 +4344,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Varning" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3806,5 +4380,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3842,53 +4416,53 @@ msgstr "Angiven tid kunde inte tolkas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Anpassa linjeritning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Använd globala inställningar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Rita inte linjer mellan punkter i detta lager." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Välj alternativ för linjeritning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Anpassa färger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3896,6 +4470,6 @@ msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3903,31 +4477,31 @@ msgstr "Välj en färg" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "Markörer från namngivna punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "Namngivna spårpunkter från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Importera ljud" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave-ljudfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "Ljudmarkörer från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Importera bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3936,5 +4510,5 @@ msgstr[1] "{0} spår, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3943,5 +4517,5 @@ msgstr[1] "{0} rutter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3950,28 +4524,28 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "Namn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Beskrivning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Tidsomfång: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Längd: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Omvandla till datalager" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3982,11 +4556,11 @@ "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3996,29 +4570,29 @@ msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 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:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -4029,9 +4603,9 @@ "Önskar du
fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -4041,5 +4615,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -4058,24 +4632,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} raderad.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4111,5 +4685,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4118,5 +4692,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4125,5 +4699,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4261,5 +4835,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Välj vilken rad du vill ta bort." @@ -5619,5 +6193,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Uppdatera" @@ -5629,7 +6203,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Lägg till antingen site-josm.xml eller wikisidor." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5637,4 +6210,8 @@ msgid "Please select an entry." msgstr "Välj en post." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6028,5 +6605,5 @@ msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6037,15 +6614,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, 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:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -6055,18 +6632,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -6104,8 +6681,53 @@ msgstr "Förbereder data..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "GPX-filer" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "Markörer från {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument" +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "NMEA-0183-filer" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "Koordinater importerade: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Felaktigt utformade meningar: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Checksum-fel: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Okända meningar: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Nollkoordinater: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "Import från NMEA genomförd" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "Import från NMEA misslyckades!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6163,4 +6785,13 @@ msgstr "Okänd värddator" +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 msgid "Incorrect password or username." @@ -6177,5 +6808,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Enter Password" -msgstr "Ange losenord" +msgstr "Ange lösenord" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 @@ -6188,8 +6819,16 @@ msgstr "Avbryter..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "OSM serverfiler" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6233,7 +6872,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Tog bort medlemmen ''{0}'' i relationen." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6280,5 +6919,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6301,15 +6940,20 @@ "igen efter en stund." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, 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:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Uppdatera insticksmoduler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "Hämta insticksprogram" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6323,22 +6967,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Kunde inte hämta insticksmodul: {0} från {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -msgid "" -"The plugin {0} seems to be broken or could not be downloaded automatically." -msgstr "" -"Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt." +msgid "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6356,26 +7010,27 @@ "längre." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -"Plugin {0}, som behövs för att plugin {1} ska fungera, men det hittades inte." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +"Insticksmodul {0} behövs för att insticksmodul {1} ska fungera, men kunde " +"inte hittas." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Insticksmodulen kunde ej hittas: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6385,12 +7040,12 @@ "med hjälp av inställningen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Avaktivera insticksmodul" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -6399,9 +7054,9 @@ "inställningarna?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "Behåll plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6411,5 +7066,5 @@ "JOSM har behörighet att skriva över de existerande." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6418,10 +7073,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6430,9 +7085,9 @@ "innan du rapporterar en bugg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Skall insticksmodulen avaktiveras?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6442,5 +7097,5 @@ "frigöra insticksmodulen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6450,19 +7105,19 @@ "JOSM från." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "ingen beskrivning tillgänglig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6471,13 +7126,13 @@ msgstr[1] "Hämtade information om insticksmoduler från {0} ställen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Kunde inte hitta någon information om insticksmoduler." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Alla installerade insticksmoduler är av senaste version." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6490,9 +7145,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Hämta saknade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6505,10 +7160,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "Hämta insticksprogram" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6531,41 +7182,14 @@ msgstr "okänd" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Insticksmodul som medföljer JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Insticksmodulen finns redan" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "Ta bort och hämta hem" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6718,9 +7342,4 @@ msgstr "Ange beskrivning för ditt spår." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "Taggar" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6892,4 +7511,9 @@ 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 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fel vid tolkning {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 @@ -7123,6 +7747,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fel vid läsning av fil" @@ -7447,37 +8071,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Tomt lager" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 msgid "Is not vectorized." msgstr "Är inte vektoriserad" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "Raster center: {0}" msgstr "Rastercenter: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is vectorized." msgstr "Är vektoriserad" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7486,16 +8115,21 @@ msgstr "Hämta WMS-lager från en fil" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7506,14 +8140,14 @@ "Skapa en ny." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "Cacheformatsfel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7554,7 +8188,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Dela sträcka" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7600,5 +8233,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 msgid "edit gpx tracks" -msgstr "editera GPX-spår" +msgstr "redigera GPX-spår" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 @@ -7988,7 +8621,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "vatten" @@ -8381,16 +9014,21 @@ msgstr "Okänd status för problemfall" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Öppna det som syns..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Okänt filformat: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8482,5 +9120,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8507,25 +9145,25 @@ msgstr "Öppna en lista över ruttnoder" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "Kriterier" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "Närmaste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "Snabbaste" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "Byt riktning på rutten" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "Rensa rutten" @@ -8700,11 +9338,11 @@ msgstr "slut" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8712,8 +9350,4 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159 msgid "JOSM Tag Editor Plugin" -msgstr "" - -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" msgstr "" @@ -8726,5 +9360,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8733,5 +9367,5 @@ msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8753,8 +9387,14 @@ msgstr "Filter" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" msgstr "Rensa" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" +msgstr "" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -9676,7 +10316,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "byggnad (building)" @@ -9690,5 +10330,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "yta (area)" @@ -9787,4 +10427,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9883,36 +10539,36 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Automatisk hämtning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 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:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "Alfakanal" @@ -9926,52 +10582,52 @@ msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "Inställningar för WMS-insticksmodulen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menynamn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Menynamn (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS-url (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Ange ett menynamn och en URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Kopiera förval" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Välj vilken rad du vill kopiera." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -10004,5 +10660,5 @@ #: build/specialmessages.java:9 msgid "could not get audio input stream from input URL" -msgstr "kunde inte hämta ljud ström från adressen" +msgstr "kunde inte hämta ljudström från adressen" #. Java message loading audio data @@ -10061,7 +10717,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10211,6 +10866,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11028,5 +11688,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "privat" @@ -11074,5 +11734,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "mål" @@ -11109,5 +11769,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "med tillåtelse" @@ -11339,6 +11999,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "motorväg" @@ -11364,6 +12024,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "stamväg" @@ -11389,6 +12049,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "primärväg" @@ -11414,6 +12074,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "sekundärväg" @@ -11427,5 +12087,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "tertiärväg" @@ -11443,5 +12103,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "bostadsgata" @@ -11459,5 +12119,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "tillfartsväg" @@ -11484,6 +12144,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "under byggnad" @@ -11533,5 +12193,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "rondell" @@ -12510,5 +13170,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "kärr" @@ -12689,5 +13349,5 @@ #: build/trans_presets.java:1204 msgid "Edit Pier" -msgstr "Ändra Pir" +msgstr "Redigera pir" #. item "Waterway Point/Pier" text "Name" @@ -14232,27 +14892,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "sport" @@ -15439,5 +16099,5 @@ #: build/trans_presets.java:2215 msgid "Edit Windmill" -msgstr "Ändra Väderkvarn" +msgstr "Redigera väderkvarn" #. item "Man Made/Windmill" text "Name" @@ -15474,5 +16134,5 @@ #: build/trans_presets.java:2235 msgid "Edit Crane" -msgstr "Ändra Kran" +msgstr "Redigera kran" #. item "Man Made/Crane" text "Name" @@ -15496,5 +16156,5 @@ #: build/trans_presets.java:2247 msgid "Edit Survey Point" -msgstr "Ändra Mätpunkt" +msgstr "Redigera mätpunkt" #. item "Man Made/Survey Point" text "Name" @@ -15507,5 +16167,5 @@ #: build/trans_presets.java:2253 msgid "Edit Surveillance Camera" -msgstr "Ändra Övervakning" +msgstr "Redigera övervakningskamera" #. item "Man Made/Surveillance" text "Name" @@ -16102,5 +16762,5 @@ #: build/trans_presets.java:2486 msgid "Edit Hairdresser" -msgstr "Ändra Hårfrisör" +msgstr "Redigera hårfrisör" #. item "Shops/Hairdresser" text "Name" @@ -16250,5 +16910,5 @@ #: build/trans_presets.java:2564 msgid "Edit Dentist" -msgstr "Ändra Tandläkare" +msgstr "Redigera tandläkare" #. item "Health/Dentist" text "Name" @@ -16312,5 +16972,5 @@ #: build/trans_presets.java:2591 msgid "(Use international code, like +12-345-67890)" -msgstr "Använd internationalt format, ex +12-345-67890" +msgstr "Använd internationellt format, ex +12-345-67890" #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" @@ -16325,5 +16985,5 @@ #: build/trans_presets.java:2597 msgid "Edit Veterinary" -msgstr "Ändra Veterinär" +msgstr "Redigera veterinär" #. group "Places" @@ -17090,8 +17750,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "cykel" @@ -17152,6 +17812,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -17162,8 +17820,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "fot" @@ -17189,5 +17847,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "tunnelbana" @@ -17272,4 +17930,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17284,8 +17943,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17305,5 +17966,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "" @@ -17393,7 +18054,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "bro" @@ -17657,15 +18318,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "förlegad" @@ -17707,5 +18368,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "häst" @@ -17915,11 +18576,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17957,6 +18618,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "gata" @@ -18012,7 +18673,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "landsvägsspår" @@ -18068,8 +18729,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "räls" @@ -18090,5 +18751,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -18102,5 +18763,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -18121,5 +18782,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "vändplats" @@ -18134,5 +18795,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -18147,5 +18808,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "flodbank" @@ -18159,5 +18820,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "bäck" @@ -18171,5 +18832,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "hamn" @@ -18197,5 +18858,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "akvedukt" @@ -18363,13 +19024,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "byggnadsverk" @@ -18431,7 +19092,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "järnvägspunkt" @@ -18454,10 +19115,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "" @@ -18487,6 +19148,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "" @@ -18531,6 +19192,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "" @@ -18544,5 +19205,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18564,5 +19225,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "" @@ -18576,5 +19237,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "" @@ -18622,7 +19283,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "linbana" @@ -18639,5 +19300,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "" @@ -18652,5 +19313,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "" @@ -18665,5 +19326,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "" @@ -18678,5 +19339,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18691,5 +19352,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "" @@ -18704,5 +19365,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "" @@ -18807,10 +19468,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "kraft" @@ -18823,8 +19484,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "pir" @@ -18838,5 +19497,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "rörledning" @@ -18964,12 +19623,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "fritid" @@ -18983,5 +19642,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "marina" @@ -19053,8 +19712,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "inrättning" @@ -19156,10 +19815,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "trafikinrättning" @@ -19545,22 +20204,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "" @@ -19592,6 +20251,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "" @@ -19652,8 +20311,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "hälsa" @@ -20006,26 +20665,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "affär" @@ -20097,8 +20756,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotell" @@ -20248,9 +20907,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turism" @@ -20322,8 +20981,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "historisk" @@ -20394,8 +21053,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "" @@ -20409,5 +21068,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "stenbrott" @@ -20421,5 +21080,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "" @@ -20441,5 +21100,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "hamnbassäng" @@ -20453,5 +21112,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "skog" @@ -20465,5 +21124,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "" @@ -20486,5 +21145,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "detaljhandel" @@ -20498,5 +21157,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "industri" @@ -20510,5 +21169,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "" @@ -20522,5 +21181,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "" @@ -20534,5 +21193,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "" @@ -20589,7 +21248,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "militär" @@ -20603,5 +21262,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "begravningsplats" @@ -20614,5 +21273,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "topp" @@ -20627,5 +21286,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "glaciär" @@ -20639,5 +21298,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "vulkan" @@ -20692,8 +21351,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "naturfenomen" @@ -20707,5 +21366,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "buskage" @@ -20719,5 +21378,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "hed" @@ -20731,5 +21390,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "skog" @@ -20743,5 +21402,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "lera" @@ -20755,5 +21414,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "strand" @@ -20831,8 +21490,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "rutt" @@ -20880,7 +21539,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "gräns" @@ -21022,10 +21681,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "plats" @@ -21073,6 +21732,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adress" @@ -21303,10 +21962,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Open Aerial Map" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21354,4 +22013,32 @@ msgstr "" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor." + +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21361,10 +22048,4 @@ #~ "musknapp och flytta musen. Välj: Klicka" -#~ msgid "Commit comment" -#~ msgstr "Bidragskommentar" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - #~ msgid "Charge" #~ msgstr "Avgift" @@ -21375,4 +22056,13 @@ #~ 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 "Plugin already exists" +#~ msgstr "Insticksmodulen finns redan" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" #~ msgid "Drawbridge" @@ -21386,4 +22076,21 @@ #~ msgstr "Fällgaller" +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ 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 "viaduct" #~ msgstr "viadukt" @@ -21392,4 +22099,7 @@ #~ msgstr "Sportaffär" +#~ msgid "Delete and Download" +#~ msgstr "Ta bort och hämta hem" + #~ msgid "Edit Drawbridge" #~ msgstr "Redigera en klaffbro" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 15801) +++ /applications/editors/josm/i18n/po/tr.po (revision 15802) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-23 22:22+0200\n" -"PO-Revision-Date: 2009-05-19 09:27+0000\n" +"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"PO-Revision-Date: 2009-05-23 21:54+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Türkçe\n" @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-05-23 20:14+0000\n" +"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:187 +#: ../core/src/org/openstreetmap/josm/Main.java:189 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -27,67 +27,69 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 +#: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299 msgid "Help" msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:259 +#: ../core/src/org/openstreetmap/josm/Main.java:261 msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:347 +#: ../core/src/org/openstreetmap/josm/Main.java:349 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:348 +#: ../core/src/org/openstreetmap/josm/Main.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Saklanılmayan Çalışmalar" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:351 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:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Save and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 msgid "Discard and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:352 #: ../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:48 +#: ../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/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../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/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -95,5 +97,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 @@ -102,10 +104,10 @@ msgstr "İptal" -#: ../core/src/org/openstreetmap/josm/Main.java:376 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:389 +#: ../core/src/org/openstreetmap/josm/Main.java:391 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" @@ -189,5 +191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 msgid "Plugins" msgstr "Eklentiler" @@ -254,15 +256,15 @@ msgstr "Boylam" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 msgid "Align Nodes in Circle" msgstr "Daire içindeki kavşakları hizala" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 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:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 @@ -271,8 +273,9 @@ #: ../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/ReverseWayAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -293,9 +296,9 @@ msgstr "Araç: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92 msgid "Some of the nodes are (almost) in the line" msgstr "bazı kavşaklar zaten hizada" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179 msgid "Please select at least four nodes." msgstr "Lütfen en az dört kavşak seçiniz." @@ -330,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 msgid "conflict" msgstr "Çelişki" @@ -472,5 +475,5 @@ #: ../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:293 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 @@ -481,7 +484,7 @@ #: ../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:216 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Sil" @@ -491,14 +494,15 @@ msgstr "Seçili Objeleri Sil." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../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:34 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 msgid "Overwrite" msgstr "Üzerine Yaz" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 msgid "File exists. Overwrite?" msgstr "Dosya mevcut. Üzerine Yaz?" @@ -526,9 +530,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../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:69 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 #, java-format msgid "File: {0}" @@ -566,16 +570,4 @@ msgstr "Programı Kapat." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "OSM Server Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 -msgid "NMEA-0183 Files" -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 msgid "" @@ -649,12 +641,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -662,5 +654,5 @@ #: ../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:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 msgid "Error" msgstr "Hata" @@ -681,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -790,4 +782,18 @@ msgstr "{0} Kavşak birleştirildi" +#: ../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:70 +msgid "Mirror" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" @@ -844,67 +850,25 @@ msgstr "isimsiz" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open..." msgstr "Aç..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 msgid "Open a file." msgstr "Dosya aç." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 -#, java-format -msgid "Error while parsing {0}" -msgstr "Ayrıştırma sırasında hata {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 +#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../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:95 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108 -#, java-format -msgid "Unknown file extension: {0}" -msgstr "Bilinmeyen Dosya Uzantısı: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 -#, java-format -msgid "Markers from {0}" -msgstr "İmleçler {0}" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135 -msgid "Coordinates imported: " -msgstr "İçeri alınan koordinatlar: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136 -msgid "Malformed sentences: " -msgstr "Yanlış cümleler: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137 -msgid "Checksum errors: " -msgstr "Kontoltoplamı hatası: " - -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139 -msgid "Unknown sentences: " -msgstr "Bilinmeyen cümleler: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140 -msgid "Zero coordinates: " -msgstr "Sıfır koordinatlar: " - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144 -msgid "NMEA import success" -msgstr "NMEA içeri alınması başarılı" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148 -msgid "NMEA import faliure!" -msgstr "NMEA içeri alınmasında hata!" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -978,5 +942,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114 msgid "Paste" msgstr "Yapıştır" @@ -1006,5 +970,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 msgid "Preferences" msgstr "Tercihler" @@ -1050,14 +1014,19 @@ msgstr "Yolları ters çevir" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 msgid "Save" msgstr "Kaydet" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 msgid "Save the current data." msgstr "Şimdiki bilgiyi kaydet." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1067,26 +1036,26 @@ "bildiriniz" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 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:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Empty document" msgstr "Boş döküman" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 msgid "Conflicts" msgstr "Çelişkiler" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1094,32 +1063,36 @@ msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +msgid "Save OSM file" +msgstr "OSM dosyası olarak sakla" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 msgid "Save GPX file" msgstr "GPX olarak sakla" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Save OSM file" -msgstr "OSM dosyası olarak sakla" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Save Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 msgid "Could not back up file." msgstr "Yedek dosyası oluşturulamadı." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 msgid "Unknown file extension." msgstr "Bilinmeyen dosya uzantısı." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "An error occurred while saving." msgstr "Kaydetme sırasında bir hata oluştu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 msgid "An error occurred while restoring backup file." msgstr "Yedek dosyası içeri alınırken hata oluştu." @@ -1251,59 +1224,59 @@ msgstr "Genel ayarları sabitle ''{0}''." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Yolları Çıkar" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Birçok yol tarafında kullanılan kavşakları çift yap." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 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:100 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 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:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 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:111 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 msgid "Select either:" msgstr "Şunların Arasında Seçiniz:" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Bir veya birden kavşağı olan yol, birden fazla yol tarafında " +"kullanılabilir, veya" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Bir veya birden kavşağı olan yol, birden fazla yol tarafında " -"kullanılabilir, veya" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1316,9 +1289,9 @@ "kopyalarını oluşturur ve bütün kavşaklar seçilir" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 #, java-format msgid "Dupe into {0} nodes" @@ -1326,5 +1299,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1382,50 +1355,50 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69 msgid "Upload to OSM..." msgstr "OSM ye yükle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 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:83 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Objects to add:" msgstr "Eklenilecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 msgid "Objects to modify:" msgstr "Düzenlenecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 msgid "Objects to delete:" msgstr "Silinecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 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:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Upload these changes?" msgstr "Değişiklikleri yükle?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 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:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 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:165 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "No changes to upload." msgstr "Yüklenilecek değişiklik yok." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 msgid "Uploading data" @@ -1631,14 +1604,14 @@ msgstr "Yola kavşak ekle ve birleştir" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883 msgid "Create new node." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 +msgid "Select node under cursor." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892 #, java-format msgid "Insert new node into way." @@ -1647,14 +1620,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 +msgid "Start new way from last node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922 msgid "Finish drawing." msgstr "" @@ -1674,5 +1647,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 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." @@ -1684,5 +1657,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 msgid "Release the mouse button to stop rotating." msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız." @@ -1719,5 +1692,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1726,5 +1699,5 @@ "yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1749,16 +1722,16 @@ "sağzoom taşı ise sağ klik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 #: ../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:40 +#: ../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:46 +#: ../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 @@ -1766,145 +1739,155 @@ msgstr "Bilgi yüklenemedi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56 +#: ../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:60 +#: ../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:61 +#: ../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:62 +#: ../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:68 +#: ../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:69 +#: ../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:82 +#: ../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:83 +#: ../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:84 +#: ../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:85 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "foot: - key=foot set to any value." -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "Special targets:" +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:89 +#: ../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:90 +#: ../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:91 +#: ../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:92 +#: ../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:93 +#: ../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:94 +#: ../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:95 +#: ../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:96 +#: ../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:97 +#: ../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:98 +#: ../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:99 +#: ../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:100 +#: ../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:108 +#: ../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:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173 +#: ../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:175 +#: ../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:177 +#: ../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:181 +#: ../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:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 msgid "RX" msgstr "RX" @@ -1921,15 +1904,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387 +#: ../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: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:493 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 msgid "Missing arguments for or." msgstr "or için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 msgid "Missing argument for not." msgstr "not için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409 +#: ../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:592 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#, 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:602 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33 @@ -1964,7 +1977,7 @@ #: ../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:273 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Ekle" @@ -2003,4 +2016,8 @@ msgstr "Ayarla {0}={1} için {2} {3}" +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 +msgid "ChangeRelationMemberRole" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format @@ -2008,64 +2025,10 @@ msgstr "Çözümle {0} karşıklıkları {1} objelerinde" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 -#, java-format -msgid "Delete {1} {0}" -msgstr "Sil {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 -#, java-format -msgid "Delete {0} {1}" -msgstr "Sil {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 -msgid "Conflicting relation" -msgstr "İlişkilerde Karışıklık" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#, 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:148 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 -#, 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:328 -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:347 -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/MoveCommand.java:122 -msgid "Move" -msgstr "Taşı" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 @@ -2076,169 +2039,18 @@ msgstr[0] "kavşak" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" -msgstr "İlişkiÜyesinikaldır" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 -msgid "Rotate" -msgstr "Dönder" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 -msgid "Sequence" -msgstr "Sıra" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Uygula?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 -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:39 -msgid "Apply selected changes" -msgstr "Seçili değişiklikleri uygula" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Don't apply changes" -msgstr "Değişiklikleri Uygulama" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82 -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:95 -msgid "Properties of " -msgstr "Özellikleri " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 -msgid "Roles in relations referring to" -msgstr "İlişkide rolü şunu gösteriyor" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 -msgid "Automatic tag correction" -msgstr "Otomatic etiket düzetmesi" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Tercihler klasörü açılamıyor: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338 -#, 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/ConflictItem.java:34 -msgid "different" -msgstr "farklı" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -msgid "deleted" -msgstr "silindi" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "doğru" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "yanlış" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "pozisyon" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 -msgid "Decimal Degrees" -msgstr "Ondalık Derece" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 -msgid "Degrees Minutes Seconds" -msgstr "Derece Dakika Saniye" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "S" -msgstr "G" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 -msgid "N" -msgstr "K" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "W" -msgstr "B" - -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 -msgid "E" -msgstr "D" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 -msgid "incomplete" -msgstr "eksik" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Error: {0}" -msgstr "Hata: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 -#, java-format -msgid "Warning: {0}" -msgstr "Uyarı: {0}" - +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 +msgid "way" +msgid_plural "ways" +msgstr[0] "yol" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 @@ -2249,4 +2061,263 @@ msgstr[0] "ilişki" +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +#, java-format +msgid "Delete {1} {0}" +msgstr "Sil {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#, java-format +msgid "Delete {0} {1}" +msgstr "Sil {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +msgid "Conflicting relation" +msgstr "İlişkilerde Karışıklık" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#, 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:149 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#, 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:366 +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:385 +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:53 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +msgid "Move" +msgstr "Taşı" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in member list of of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 +msgid "RemoveRelationMember" +msgstr "İlişkiÜyesinikaldır" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 +msgid "Rotate" +msgstr "Dönder" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +msgid "Sequence" +msgstr "Sıra" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Uygula?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +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/ConflictItem.java:34 +msgid "different" +msgstr "farklı" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "deleted" +msgstr "silindi" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "true" +msgstr "doğru" + +#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 +msgid "false" +msgstr "yanlış" + +#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 +msgid "position" +msgstr "pozisyon" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +msgid "Decimal Degrees" +msgstr "Ondalık Derece" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +msgid "Degrees Minutes Seconds" +msgstr "Derece Dakika Saniye" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "S" +msgstr "G" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +msgid "N" +msgstr "K" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "W" +msgstr "B" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +msgid "E" +msgstr "D" + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +msgid "incomplete" +msgstr "eksik" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Error: {0}" +msgstr "Hata: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#, java-format +msgid "Warning: {0}" +msgstr "Uyarı: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101 #, java-format @@ -2279,137 +2350,129 @@ msgstr[0] "{0} Kavşak" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Alan stili yol kapalı değil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipoligon yolu ''{0}'' kapalı değil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 msgid "Empty member in relation." msgstr "İlişkide boş üye." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "''{0}'' üyesini ilişkiden sil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Yol ''{0}'' iki noktadan az içeriyor." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Yol-Değil ''{0}'' multipolygon içinde." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipoligon için dış yol yok ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "iç yol ''{0}'' dışarıda." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "İç yol stili ''{0}'' multipolygon ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Dış yol stili ''{0}'' bulunamadı." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 msgid "untagged" msgstr "etiketsiz" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 msgid "text" msgstr "metin" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 -msgid "way" -msgid_plural "ways" -msgstr[0] "yol" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2431,5 +2494,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138 msgid "background" @@ -2505,4 +2568,5 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2517,4 +2581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 @@ -2725,26 +2790,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 msgid "Tools" msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format @@ -2753,21 +2818,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 msgid "Wireframe View" msgstr "Tel Görünümü" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218 msgid "Toggle Wireframe view" msgstr "Tel Göünümünü İşaretle" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 msgid "Audio" msgstr "Ses" @@ -2877,4 +2942,493 @@ msgstr "Ayarlar Okunuyor" +#. * +#. * compare my version of an {@see OsmPrimitive} with their version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 +msgid "My with Their" +msgstr "" + +#. * +#. * compare my version of an {@see OsmPrimitive} with the merged version +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 +msgid "My with Merged" +msgstr "" + +#. * +#. * compare their version of an {@see OsmPrimitive} with the merged veresion +#. +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 +msgid "Their with Merged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 +#, java-format +msgid "role {0} is not participating in compare pair {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +msgid "Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 +msgid "Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +msgid "Nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 +msgid "Members" +msgstr "Üyeler" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +msgid "No pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#, java-format +msgid "{0} pending tag conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +msgid "Nodes(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +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:108 +msgid "Nodes(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +msgid "Pending conflicts in the node list of this way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +msgid "Members(resolved)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +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:117 +msgid "Members(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +msgid "Pending conflicts in the member list of this relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgid "No pending property conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +msgid "Properties(with conflicts)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgid "Pending property conflicts to be resolved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +msgid "Conflict Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377 +#, java-format +msgid "parameter current out of range: got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615 +#, java-format +msgid "list in role {0} is currently not participating in a compare pair" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764 +#, java-format +msgid "unexpected value of parameter \"index\". Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 +#, java-format +msgid "item {0} not found in list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 +msgid "lock scrolling" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 +msgid "Compare " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +msgid "My version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 +msgid "List of elements in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 +msgid "Merged version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 +msgid "" +"List of merged elements. They will replace the my elements when the merge " +"decisions are applied." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgid "Their version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 +msgid "List of elements in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 +msgid "> top" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 +msgid "Copy my selected nodes to the start of the merged node list" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 +msgid "> bottom" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 +msgid "" +"Copy my selected elements before the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 +msgid "" +"Copy my selected elements after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 +msgid "" +"Copy their selected elements before the first selected element in the list " +"of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 +msgid "" +"Copy their selected element after the first selected element in the list of " +"merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 +msgid "Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 +msgid "Move up the selected elements by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 +msgid "Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 +msgid "Move down the selected entries by one position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 +msgid "Remove" +msgstr "Çıkart" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 +msgid "Remove the selected entries from the list of merged elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 +msgid "Freeze" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 +msgid "Unfreeze" +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 +#, java-format +msgid "" +"Click {0} to start merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 +#, java-format +msgid "My version ({0} entry)" +msgid_plural "My version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 +#, java-format +msgid "Merged version ({0} entry)" +msgid_plural "Merged version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 +#, java-format +msgid "Their version ({0} entry)" +msgid_plural "Their version ({0} entries)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76 +#: ../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: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 +msgid "parameter '{0}' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#, java-format +msgid "" +"adjustable {0} not registered yet. Can't set participation in synchronized " +"adjustment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#, java-format +msgid "adjustable {0} not registered yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 +msgid "Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 +msgid "Merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#, java-format +msgid "unexpected column index. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +msgid "Properties in my dataset, i.e. the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +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:89 +msgid "Properties in their dataset, i.e. the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +msgid "Coordinates:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +msgid "Deleted State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../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:265 +msgid "not deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +msgid "Keep my coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +msgid "Keep their coordiates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +msgid "Undecide conflict between different coordinates" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +msgid "Keep my deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +msgid "Keep their deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +msgid "Undecide conflict between deleted 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:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Role" +msgstr "Rol" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +msgid "Primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 +msgid "merged nodes not frozen yet. Can't build resolution command" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58 +#, java-format +msgid "The merged dataset will not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61 +#, java-format +msgid "My dataset does not include a tag with key {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +msgid "cannot apply undecided tag merge item" +msgstr "" + +#. should not happen, but just in case +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38 +#, java-format +msgid "Parameter 'col' must be 0 or 1. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 +msgid "My version (local dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 +msgid "Their version (server dataset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 +msgid ">" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 +msgid "Keep the selected key/value pairs from the server dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 +msgid "Undecide" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 +msgid "Mark the selected tags as undecided" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61 +#, java-format +msgid "Their dataset does not include a tag with key {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -2888,5 +3442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -2917,33 +3471,77 @@ msgstr "Haritada seçili elemanları listedede seç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Resolve" msgstr "Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 msgid "Open a merge dialog of all selected items in the list above." msgstr "Seçili nesneler için birleştime penceresi aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 msgid "Conflict" msgstr "Çelişki" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Merging conflicts." msgstr "Çelişkileri Birleştir." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 +msgid "WARNING: unexpected value for preference conflict.resolution, got " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 msgid "Resolve Conflicts" msgstr "Çelişkileri Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 msgid "Solve Conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 #, java-format msgid "Conflicts: {0}" msgstr "Çeşişkiler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +msgid "Resolve conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +msgid "Apply partial resolutions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#, 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:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Uyarı" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -3101,10 +3699,4 @@ msgid "Member Of" msgstr "Üyesi" - -#. setting up the member table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 -msgid "Role" -msgstr "Rol" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568 @@ -3286,8 +3878,4 @@ msgstr "Etiket (Boş değerler etiketi siler)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197 -msgid "Members" -msgstr "Üyeler" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 msgid "Move Up" @@ -3321,11 +3909,4 @@ msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65 -msgid "Remove" -msgstr "Çıkart" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 @@ -3380,5 +3961,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3403,5 +3984,5 @@ msgstr "Evet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -3428,24 +4009,24 @@ msgstr "hayır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413 #, java-format msgid "Members: {0}" msgstr "Üyeler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "There were conflicts during import." msgstr "İçeri taşıma esnasında karşıklık oluştu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539 msgid "Error parsing server response." msgstr "Serverın cevabı tanımlanamdı." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "Cannot connect to server." msgstr "Server'a bağlantı kurulamadı." @@ -3698,10 +4279,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Uyarı" - #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 #, java-format @@ -3739,5 +4314,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" @@ -3775,53 +4350,53 @@ msgstr "Girilen zaman ayrıştırılamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../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:217 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "gps point" msgstr "gps noktası" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 msgid "Customize line drawing" msgstr "Çizimi özelleştir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 msgid "Use global settings." msgstr "Genel ayarları kullan." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 -#: ../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:191 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:126 -#: ../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:192 msgid "Do not draw lines between points for this layer." msgstr "Bu tabaka için çizgileri birleştirme." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Select line drawing options" msgstr "Çizim seçeneklerini seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 +#: ../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 msgid "Customize Color" msgstr "Renkleri Ayarla" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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:336 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 msgid "OK" msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../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 @@ -3829,6 +4404,6 @@ msgstr "Varsayılan" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../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 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -3836,31 +4411,31 @@ msgstr "Renk seç" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 msgid "Markers From Named Points" msgstr "işaretli noktalardan imleçler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 #, java-format msgid "Named Trackpoints from {0}" msgstr "{0} isim verilen izler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 msgid "Import Audio" msgstr "Sesi içeri al" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 msgid "Wave Audio files (*.wav)" msgstr "Wave Audio files (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #, java-format msgid "Audio markers from {0}" msgstr "{0} daki ses imleçleri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227 msgid "Import images" msgstr "Görüntüleri içeri al" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #, java-format msgid "{0} track, " @@ -3868,5 +4443,5 @@ msgstr[0] "{0} iz, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298 #, java-format msgid "{0} route, " @@ -3874,5 +4449,5 @@ msgstr[0] "{0} rut, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "{0} waypoint" @@ -3880,28 +4455,28 @@ msgstr[0] "{0} yol noktaları" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303 #, java-format msgid "Name: {0}" msgstr "İsim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "Description: {0}" msgstr "Tanım: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Timespan: " msgstr "Zaman_aralığı: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337 msgid "Length: " msgstr "Uzunluk: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "Convert to data layer" msgstr "Bilgi tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 msgid "" @@ -3912,11 +4487,11 @@ "yüklemek isterseniz buraya bakınız:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -3926,29 +4501,29 @@ msgstr "Çevrildiği yer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 #, java-format msgid "{0} meters" msgstr "{0} metre" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805 #, java-format msgid "" @@ -3959,9 +4534,9 @@ "istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879 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:1025 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -3969,5 +4544,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -3985,24 +4560,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #, java-format msgid " ({0} deleted.)" msgstr " ({0} silindi.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -4036,5 +4611,5 @@ msgstr[0] "nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 #, java-format msgid "a track with {0} point" @@ -4042,5 +4617,5 @@ msgstr[0] "{0} noktalı iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} consists of {1} track" @@ -4048,5 +4623,5 @@ msgstr[0] "{0} {1} izden oluşur" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 #, java-format msgid "{0} point" @@ -4178,5 +4753,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Silmek için bir satır seçiniz." @@ -5517,5 +6092,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 msgid "Update" msgstr "Güncelle" @@ -5527,7 +6102,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -msgid "Add either site-josm.xml or Wiki Pages." -msgstr "site-josm.xml veya Wiki Pages ekle." +msgid "Add JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -5535,4 +6109,8 @@ msgid "Please select an entry." msgstr "Lütfen bir seçim yapınız." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +msgid "Edit JOSM Plugin description URL." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -5909,5 +6487,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -5918,15 +6496,15 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 #: ../plugins/terracer/src/terracer/TerracerAction.java:108 #, java-format @@ -5935,18 +6513,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 #: ../plugins/terracer/src/terracer/TerracerAction.java:110 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -5984,8 +6562,53 @@ msgstr "Bilgiler hazırlanıyor..." +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 +#, java-format +msgid "Markers from {0}" +msgstr "İmleçler {0}" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı." +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +msgid "NMEA-0183 Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Coordinates imported: " +msgstr "İçeri alınan koordinatlar: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +msgid "Malformed sentences: " +msgstr "Yanlış cümleler: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +msgid "Checksum errors: " +msgstr "Kontoltoplamı hatası: " + +#. don't scare the user unneccessarily +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +msgid "Unknown sentences: " +msgstr "Bilinmeyen cümleler: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +msgid "Zero coordinates: " +msgstr "Sıfır koordinatlar: " + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +msgid "NMEA import success" +msgstr "NMEA içeri alınması başarılı" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +msgid "NMEA import faliure!" +msgstr "NMEA içeri alınmasında hata!" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 msgid "This version of JOSM is incompatible with the configured server." @@ -6042,4 +6665,13 @@ msgid "Unknown host" msgstr "Tanımsız host" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +msgid "OSM Server Files bzip2 compressed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +msgid "Invalid bz2 file." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6068,8 +6700,16 @@ msgstr "İptal Edildi..." +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +msgid "OSM Server Files gzip compressed" +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 +msgid "OSM Server Files" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 msgid "Unknown version" @@ -6113,7 +6753,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 -#, fuzzy, java-format +#, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "''{0}'' üyesini ilişkiden sil." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 @@ -6159,5 +6799,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 #, java-format msgid "" @@ -6180,15 +6820,20 @@ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 msgid "Update Plugins" msgstr "Eklentileri Güncelle" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 +msgid "Download Plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 #, java-format msgid "" @@ -6201,21 +6846,32 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53 -#, java-format -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." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110 -#, java-format -msgid "Could not download plugin: {0} from {1}" -msgstr "Eklenti indirilemedi: {0} ve {1}" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#, java-format +msgid "{0} Plugin successfully downloaded. Please restart JOSM." +msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +#, java-format +msgid "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -#, java-format -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 "Skip download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Download Plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgid "Skip Download" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -6231,25 +6887,25 @@ msgstr "Uyarı - {0} eklentisi istenildi. Eklenti artık gerekli değil." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 -#, java-format -msgid "Plugin requires JOSM update: {0}." -msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#, java-format +msgid "Plugin {0} requires JOSM update to version {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 #, java-format msgid "Plugin not found: {0}." msgstr "Eklenti Bulunamadı: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 #, 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:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 msgid "" "(You can change the number of days after which this warning appears
by " @@ -6259,21 +6915,21 @@ "değiştirebilirsin.
" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../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:247 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 msgid "Disable plugin" msgstr "Eklentiyi Pasif Yap" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, 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:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -6283,5 +6939,5 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 #, java-format msgid "" @@ -6289,10 +6945,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 #, 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:261 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -6300,9 +6956,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 msgid "Should the plugin be disabled?" msgstr "Eklentiyi Pasif Hale Getireyim mi?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -6312,5 +6968,5 @@ "çalıştırın." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -6318,19 +6974,19 @@ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Bilgi" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 msgid "no description available" msgstr "Açıklama mevcut değil" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 #, java-format msgid "Downloaded plugin information from {0} site" @@ -6338,13 +6994,13 @@ msgstr[0] "{0} sitesinden indirilen eklenti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 msgid "No plugin information found." msgstr "Eklenti bilgisi bulunamadı." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "All installed plugins are up to date." msgstr "Bütün eklentiler güncel." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 #, java-format msgid "" @@ -6357,9 +7013,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127 msgid "Download missing plugins" msgstr "Eksik eklentileri yükle" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128 #, java-format msgid "" @@ -6372,10 +7028,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -6398,41 +7050,14 @@ msgstr "bilinmeyen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versiyon {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202 msgid "Plugin bundled with JOSM" msgstr "Eklenti JOSM ile beraber geliyor." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 -msgid "Plugin already exists" -msgstr "Eklentiler zaten mevcut" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218 -#, java-format -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}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 -msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#, java-format -msgid "Error deleting plugin file: {0}" -msgstr "Eklentinin silinmesinde hata: {0}" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346 #, java-format msgid "Error reading plugin information file: {0}" @@ -6582,9 +7207,4 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229 -msgid "Tags" -msgstr "" - #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 msgid "Please enter tags about your trace." @@ -6756,4 +7376,9 @@ 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 +#, 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 @@ -6984,6 +7609,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" @@ -7299,37 +7924,42 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 msgid "Blank Layer" msgstr "Boş Tabaka" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 #, java-format msgid "Raster center: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +msgid "Save WMS layer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 @@ -7338,16 +7968,21 @@ msgstr "WMS tabakasını dosyadan yükle" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +msgid "Load WMS layer" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 +#: ../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/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481 #, java-format msgid "" @@ -7356,14 +7991,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499 msgid "Cache Lambert Zone Error" msgstr "" @@ -7404,7 +8039,6 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#, fuzzy msgid "Split area" -msgstr "Yolları Böl" +msgstr "" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -7837,7 +8471,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:946 build/trans_style.java:963 -#: build/trans_style.java:979 build/trans_style.java:3334 -#: build/trans_style.java:3342 +#: build/trans_style.java:947 build/trans_style.java:964 +#: build/trans_style.java:980 build/trans_style.java:3333 +#: build/trans_style.java:3341 msgid "water" msgstr "su" @@ -8224,16 +8858,21 @@ msgstr "Bilinmeyen konu durumu" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44 #: ../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 "Görünür Aç..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 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:55 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 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 +#, java-format +msgid "Unknown file extension: {0}" +msgstr "Bilinmeyen Dosya Uzantısı: {0}" #: ../plugins/osmarender/src/OsmarenderPlugin.java:41 @@ -8324,5 +8963,5 @@ #. TODO Use constructor with shortcut #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -8349,25 +8988,25 @@ msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 msgid "Fastest" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139 msgid "Reverse route" msgstr "" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152 msgid "Clear route" msgstr "" @@ -8540,11 +9179,11 @@ msgstr "bitiş" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 +msgid "Edit tags" +msgstr "" + +#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61 -msgid "Edit tags" -msgstr "" - -#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" msgstr "" @@ -8554,8 +9193,4 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29 -msgid "(none)" -msgstr "" - #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 msgid "Highlight" @@ -8566,5 +9201,5 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format msgid "Remove old keys from up to {0} object" @@ -8573,5 +9208,5 @@ msgstr[1] "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 #, java-format msgid "Updating properties of up to {0} object" @@ -8593,7 +9228,13 @@ msgstr "" -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61 msgid "Clear" +msgstr "" + +#. should not happen +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83 +#, java-format +msgid "unexpected column number {0}" msgstr "" @@ -9496,7 +10137,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4069 build/trans_style.java:4076 -#: build/trans_style.java:4083 build/trans_style.java:4090 -#: build/trans_style.java:4097 +#: build/trans_style.java:4068 build/trans_style.java:4075 +#: build/trans_style.java:4082 build/trans_style.java:4089 +#: build/trans_style.java:4096 msgid "building" msgstr "yapılar" @@ -9510,5 +10151,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4104 +#: build/trans_style.java:4103 msgid "area" msgstr "alan" @@ -9601,4 +10242,20 @@ msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 +msgid "Select a starting node on the end of a way" +msgstr "" + +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +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:156 +msgid "Reached a junction" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 @@ -9694,19 +10351,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 msgid "Automatic downloading" msgstr "Otomatik indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 #, 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:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, 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:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -9715,17 +10372,17 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 msgid "Alpha channel" msgstr "" @@ -9739,51 +10396,51 @@ msgstr "Veri yüklemek için boş bir WMS tabakası aç" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 msgid "WMS Plugin Preferences" msgstr "WMS Eklenti Tercihleri" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 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:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menu İsmi" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS linki" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "Menu Name (Default)" msgstr "Menu ismi (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 msgid "WMS URL (Default)" msgstr "WMS linki (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Enter a menu name and WMS URL" msgstr "Menu ismi ve WMS linki kullanınız" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Copy Default" msgstr "Varsayılanı kopyala" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 msgid "Please select the row to copy." msgstr "Kopyalamak için bir satır seçiniz." +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Overlap tiles" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "Overlap tiles" +msgid "% of lat:" msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lat:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123 msgid "% of lon:" msgstr "" @@ -9873,7 +10530,6 @@ #: build/trans_plugins.java:17 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." +"Allows the user to anonymize timestamps and delete parts of huge GPX tracks " +"very fast." msgstr "" @@ -10023,6 +10679,11 @@ msgstr "" +#. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -10840,5 +11501,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:185 +#: build/trans_presets.java:623 build/trans_style.java:188 msgid "private" msgstr "özel" @@ -10886,5 +11547,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:192 +#: build/trans_presets.java:623 build/trans_style.java:195 msgid "destination" msgstr "varış" @@ -10921,5 +11582,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:178 +#: build/trans_presets.java:623 build/trans_style.java:181 msgid "permissive" msgstr "ihtiyari" @@ -11151,6 +11812,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:509 -#: build/trans_style.java:517 +#: build/trans_presets.java:338 build/trans_style.java:512 +#: build/trans_style.java:520 msgid "motorway" msgstr "araçyolu" @@ -11176,6 +11837,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:525 -#: build/trans_style.java:533 +#: build/trans_presets.java:338 build/trans_style.java:528 +#: build/trans_style.java:536 msgid "trunk" msgstr "ana_hat" @@ -11201,6 +11862,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:541 -#: build/trans_style.java:549 +#: build/trans_presets.java:338 build/trans_style.java:544 +#: build/trans_style.java:552 msgid "primary" msgstr "birincil" @@ -11226,6 +11887,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:557 -#: build/trans_style.java:565 +#: build/trans_presets.java:338 build/trans_style.java:560 +#: build/trans_style.java:568 msgid "secondary" msgstr "ikincil" @@ -11239,5 +11900,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:573 +#: build/trans_presets.java:338 build/trans_style.java:576 msgid "tertiary" msgstr "üçüncül" @@ -11255,5 +11916,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3085 +#: build/trans_presets.java:338 build/trans_style.java:3084 msgid "residential" msgstr "yerleşim_alanı" @@ -11271,5 +11932,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:629 +#: build/trans_presets.java:338 build/trans_style.java:632 msgid "service" msgstr "servis" @@ -11296,6 +11957,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:833 -#: build/trans_style.java:3150 build/trans_style.java:3151 +#: build/trans_presets.java:338 build/trans_style.java:834 +#: build/trans_style.java:3149 build/trans_style.java:3150 msgid "construction" msgstr "inşaat" @@ -11345,5 +12006,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:851 +#: build/trans_presets.java:400 build/trans_style.java:852 msgid "roundabout" msgstr "roundabout-döner kavşak" @@ -12322,5 +12983,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3326 +#: build/trans_presets.java:1111 build/trans_style.java:3325 msgid "marsh" msgstr "batak" @@ -14044,27 +14705,27 @@ #: build/trans_presets.java:1791 build/trans_presets.java:1800 #: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_style.java:3506 build/trans_style.java:3514 -#: build/trans_style.java:3522 build/trans_style.java:3530 -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 build/trans_style.java:3578 -#: build/trans_style.java:3586 build/trans_style.java:3594 -#: build/trans_style.java:3602 build/trans_style.java:3610 -#: build/trans_style.java:3618 build/trans_style.java:3626 -#: build/trans_style.java:3634 build/trans_style.java:3642 -#: build/trans_style.java:3650 build/trans_style.java:3658 -#: build/trans_style.java:3666 build/trans_style.java:3674 -#: build/trans_style.java:3682 build/trans_style.java:3690 -#: build/trans_style.java:3698 build/trans_style.java:3706 -#: build/trans_style.java:3714 build/trans_style.java:3722 -#: build/trans_style.java:3730 build/trans_style.java:3738 -#: build/trans_style.java:3746 build/trans_style.java:3754 -#: build/trans_style.java:3762 build/trans_style.java:3770 -#: build/trans_style.java:3778 build/trans_style.java:3786 -#: build/trans_style.java:3794 build/trans_style.java:3802 -#: build/trans_style.java:3810 build/trans_style.java:3818 -#: build/trans_style.java:3826 build/trans_style.java:3834 -#: build/trans_style.java:3842 build/trans_style.java:3850 -#: build/trans_style.java:3858 +#: build/trans_style.java:3505 build/trans_style.java:3513 +#: build/trans_style.java:3521 build/trans_style.java:3529 +#: build/trans_style.java:3537 build/trans_style.java:3545 +#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3569 build/trans_style.java:3577 +#: build/trans_style.java:3585 build/trans_style.java:3593 +#: build/trans_style.java:3601 build/trans_style.java:3609 +#: build/trans_style.java:3617 build/trans_style.java:3625 +#: build/trans_style.java:3633 build/trans_style.java:3641 +#: build/trans_style.java:3649 build/trans_style.java:3657 +#: build/trans_style.java:3665 build/trans_style.java:3673 +#: build/trans_style.java:3681 build/trans_style.java:3689 +#: build/trans_style.java:3697 build/trans_style.java:3705 +#: build/trans_style.java:3713 build/trans_style.java:3721 +#: build/trans_style.java:3729 build/trans_style.java:3737 +#: build/trans_style.java:3745 build/trans_style.java:3753 +#: build/trans_style.java:3761 build/trans_style.java:3769 +#: build/trans_style.java:3777 build/trans_style.java:3785 +#: build/trans_style.java:3793 build/trans_style.java:3801 +#: build/trans_style.java:3809 build/trans_style.java:3817 +#: build/trans_style.java:3825 build/trans_style.java:3833 +#: build/trans_style.java:3841 build/trans_style.java:3849 +#: build/trans_style.java:3857 msgid "sport" msgstr "spor" @@ -16902,8 +17563,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:206 -#: build/trans_style.java:645 build/trans_style.java:862 -#: build/trans_style.java:870 build/trans_style.java:878 -#: build/trans_style.java:886 build/trans_style.java:894 +#: build/trans_presets.java:2993 build/trans_style.java:209 +#: build/trans_style.java:648 build/trans_style.java:863 +#: build/trans_style.java:871 build/trans_style.java:879 +#: build/trans_style.java:887 build/trans_style.java:895 msgid "bicycle" msgstr "bisiklet" @@ -16964,6 +17625,4 @@ #. #. color foot -#. -#. #. color foot #. @@ -16974,8 +17633,8 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:220 -#: build/trans_style.java:653 build/trans_style.java:661 -#: build/trans_style.java:669 build/trans_style.java:672 -#: build/trans_style.java:680 +#: build/trans_presets.java:2993 build/trans_style.java:223 +#: build/trans_style.java:656 build/trans_style.java:664 +#: build/trans_style.java:672 build/trans_style.java:673 +#: build/trans_style.java:681 msgid "foot" msgstr "ayak" @@ -17001,5 +17660,5 @@ #. #. -#: build/trans_presets.java:2993 build/trans_style.java:1162 +#: build/trans_presets.java:2993 build/trans_style.java:1163 msgid "subway" msgstr "metro" @@ -17084,4 +17743,5 @@ #. - priority #. - dashed x - dashed line, length of dashes / spaces in x pixels +#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels #. - dashedcolour second (background) colour of a dashed line #. 4. linemod attributes @@ -17096,8 +17756,10 @@ #. - colour #. - priority +#. - closed (true or false - when true the area style is ignored for unclosed ways) #. 6. icon attributes #. - icon path to icon, relative to the icon path (default: subdirectory icons in #. directory where this file is) #. - priority +#. - annonate (true or false) #. 7. scale_min / scale_max #. - zoom scale for display @@ -17117,5 +17779,5 @@ #. --> #. -#: build/trans_style.java:49 +#: build/trans_style.java:52 msgid "standard" msgstr "standard" @@ -17205,7 +17867,7 @@ #. #. -#: build/trans_style.java:105 build/trans_style.java:119 -#: build/trans_style.java:126 build/trans_style.java:133 -#: build/trans_style.java:140 +#: build/trans_style.java:108 build/trans_style.java:122 +#: build/trans_style.java:129 build/trans_style.java:136 +#: build/trans_style.java:143 msgid "bridge" msgstr "köprü" @@ -17469,15 +18131,15 @@ #. #. -#: build/trans_style.java:112 build/trans_style.java:147 -#: build/trans_style.java:154 build/trans_style.java:161 -#: build/trans_style.java:589 build/trans_style.java:787 -#: build/trans_style.java:1112 build/trans_style.java:2365 -#: build/trans_style.java:3317 build/trans_style.java:3318 -#: build/trans_style.java:3872 build/trans_style.java:4156 -#: build/trans_style.java:4165 build/trans_style.java:4174 -#: build/trans_style.java:4183 build/trans_style.java:4192 -#: build/trans_style.java:4201 build/trans_style.java:4210 -#: build/trans_style.java:4211 build/trans_style.java:4220 -#: build/trans_style.java:4229 +#: build/trans_style.java:115 build/trans_style.java:150 +#: build/trans_style.java:157 build/trans_style.java:164 +#: build/trans_style.java:592 build/trans_style.java:788 +#: build/trans_style.java:1113 build/trans_style.java:2364 +#: build/trans_style.java:3316 build/trans_style.java:3317 +#: build/trans_style.java:3871 build/trans_style.java:4155 +#: build/trans_style.java:4164 build/trans_style.java:4173 +#: build/trans_style.java:4182 build/trans_style.java:4191 +#: build/trans_style.java:4200 build/trans_style.java:4209 +#: build/trans_style.java:4210 build/trans_style.java:4219 +#: build/trans_style.java:4228 msgid "deprecated" msgstr "kırılmış" @@ -17519,5 +18181,5 @@ #. #. -#: build/trans_style.java:248 build/trans_style.java:637 +#: build/trans_style.java:251 build/trans_style.java:640 msgid "horse" msgstr "at" @@ -17727,11 +18389,11 @@ #. #. color barrier -#: build/trans_style.java:355 build/trans_style.java:368 -#: build/trans_style.java:369 build/trans_style.java:382 -#: build/trans_style.java:383 build/trans_style.java:402 -#: build/trans_style.java:403 build/trans_style.java:410 -#: build/trans_style.java:423 build/trans_style.java:424 -#: build/trans_style.java:437 build/trans_style.java:438 -#: build/trans_style.java:451 build/trans_style.java:452 +#: build/trans_style.java:358 build/trans_style.java:371 +#: build/trans_style.java:372 build/trans_style.java:385 +#: build/trans_style.java:386 build/trans_style.java:405 +#: build/trans_style.java:406 build/trans_style.java:413 +#: build/trans_style.java:426 build/trans_style.java:427 +#: build/trans_style.java:440 build/trans_style.java:441 +#: build/trans_style.java:454 build/trans_style.java:455 msgid "barrier" msgstr "" @@ -17769,6 +18431,6 @@ #. #. -#: build/trans_style.java:581 build/trans_style.java:597 -#: build/trans_style.java:613 build/trans_style.java:621 +#: build/trans_style.java:584 build/trans_style.java:600 +#: build/trans_style.java:616 build/trans_style.java:624 msgid "street" msgstr "sokak" @@ -17824,7 +18486,7 @@ #. #. -#: build/trans_style.java:605 build/trans_style.java:904 -#: build/trans_style.java:912 build/trans_style.java:920 -#: build/trans_style.java:928 build/trans_style.java:936 +#: build/trans_style.java:608 build/trans_style.java:905 +#: build/trans_style.java:913 build/trans_style.java:921 +#: build/trans_style.java:929 build/trans_style.java:937 msgid "highway_track" msgstr "araçyolu_hattı" @@ -17880,8 +18542,8 @@ #. #. color rail -#: build/trans_style.java:688 build/trans_style.java:1136 -#: build/trans_style.java:1194 build/trans_style.java:1202 -#: build/trans_style.java:1211 build/trans_style.java:1219 -#: build/trans_style.java:1220 +#: build/trans_style.java:689 build/trans_style.java:1137 +#: build/trans_style.java:1195 build/trans_style.java:1203 +#: build/trans_style.java:1212 build/trans_style.java:1220 +#: build/trans_style.java:1221 msgid "rail" msgstr "demiryolu" @@ -17902,5 +18564,5 @@ #. #. -#: build/trans_style.java:802 +#: build/trans_style.java:803 msgid "services" msgstr "" @@ -17914,5 +18576,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:811 msgid "ford" msgstr "" @@ -17933,5 +18595,5 @@ #. #. -#: build/trans_style.java:825 +#: build/trans_style.java:826 msgid "turningcircle" msgstr "turningcircle-döner kavşak" @@ -17946,5 +18608,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:843 msgid "emergency_access_point" msgstr "" @@ -17959,5 +18621,5 @@ #. #. color riverbank -#: build/trans_style.java:954 build/trans_style.java:955 +#: build/trans_style.java:955 build/trans_style.java:956 msgid "riverbank" msgstr "riverbank" @@ -17971,5 +18633,5 @@ #. #. -#: build/trans_style.java:971 +#: build/trans_style.java:972 msgid "stream" msgstr "akış" @@ -17983,5 +18645,5 @@ #. #. -#: build/trans_style.java:987 +#: build/trans_style.java:988 msgid "dock" msgstr "iskele" @@ -18009,5 +18671,5 @@ #. #. -#: build/trans_style.java:1009 +#: build/trans_style.java:1010 msgid "aqueduct" msgstr "su_kemeri" @@ -18175,13 +18837,13 @@ #. #. -#: build/trans_style.java:1018 build/trans_style.java:1047 -#: build/trans_style.java:1055 build/trans_style.java:1056 -#: build/trans_style.java:1064 build/trans_style.java:1498 -#: build/trans_style.java:1505 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1549 -#: build/trans_style.java:1557 build/trans_style.java:1565 -#: build/trans_style.java:1573 build/trans_style.java:1580 -#: build/trans_style.java:1589 build/trans_style.java:1597 -#: build/trans_style.java:1605 build/trans_style.java:1613 +#: build/trans_style.java:1019 build/trans_style.java:1048 +#: build/trans_style.java:1056 build/trans_style.java:1057 +#: build/trans_style.java:1065 build/trans_style.java:1499 +#: build/trans_style.java:1506 build/trans_style.java:1515 +#: build/trans_style.java:1523 build/trans_style.java:1548 +#: build/trans_style.java:1556 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1579 +#: build/trans_style.java:1588 build/trans_style.java:1596 +#: build/trans_style.java:1604 build/trans_style.java:1612 msgid "manmade" msgstr "insan yapımı" @@ -18243,7 +18905,7 @@ #. #. -#: build/trans_style.java:1074 build/trans_style.java:1089 -#: build/trans_style.java:1104 build/trans_style.java:1120 -#: build/trans_style.java:1128 +#: build/trans_style.java:1075 build/trans_style.java:1090 +#: build/trans_style.java:1105 build/trans_style.java:1121 +#: build/trans_style.java:1129 msgid "railwaypoint" msgstr "demiryolu_noktası" @@ -18266,10 +18928,10 @@ #. #. -#: build/trans_style.java:1145 build/trans_style.java:1154 +#: build/trans_style.java:1146 build/trans_style.java:1155 msgid "otherrail" msgstr "başka_demiryolu" #. color otherrail -#: build/trans_style.java:1146 +#: build/trans_style.java:1147 msgid "railover" msgstr "demiryolu_üzeri" @@ -18299,6 +18961,6 @@ #. #. -#: build/trans_style.java:1170 build/trans_style.java:1178 -#: build/trans_style.java:1186 +#: build/trans_style.java:1171 build/trans_style.java:1179 +#: build/trans_style.java:1187 msgid "oldrail" msgstr "eski_demiryolu" @@ -18343,6 +19005,6 @@ #. #. -#: build/trans_style.java:1250 build/trans_style.java:1251 -#: build/trans_style.java:1283 +#: build/trans_style.java:1251 build/trans_style.java:1252 +#: build/trans_style.java:1284 msgid "aeroway" msgstr "havayolu" @@ -18356,5 +19018,5 @@ #. #. -#: build/trans_style.java:1259 +#: build/trans_style.java:1260 msgid "terminal" msgstr "terminal" @@ -18376,5 +19038,5 @@ #. #. -#: build/trans_style.java:1267 build/trans_style.java:1275 +#: build/trans_style.java:1268 build/trans_style.java:1276 msgid "aeroway_dark" msgstr "havayolu_ağır" @@ -18388,5 +19050,5 @@ #. #. -#: build/trans_style.java:1291 +#: build/trans_style.java:1292 msgid "aeroway_light" msgstr "hafif_hafif" @@ -18434,7 +19096,7 @@ #. #. -#: build/trans_style.java:1301 build/trans_style.java:1309 -#: build/trans_style.java:1317 build/trans_style.java:1325 -#: build/trans_style.java:1333 +#: build/trans_style.java:1302 build/trans_style.java:1310 +#: build/trans_style.java:1318 build/trans_style.java:1326 +#: build/trans_style.java:1334 msgid "aerialway" msgstr "havayolu" @@ -18451,5 +19113,5 @@ #. #. color piste_easy -#: build/trans_style.java:1343 build/trans_style.java:1344 +#: build/trans_style.java:1344 build/trans_style.java:1345 msgid "piste_easy" msgstr "basit_meydan" @@ -18464,5 +19126,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1352 build/trans_style.java:1353 +#: build/trans_style.java:1353 build/trans_style.java:1354 msgid "piste_intermediate" msgstr "orta_meydan" @@ -18477,5 +19139,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1361 build/trans_style.java:1362 +#: build/trans_style.java:1362 build/trans_style.java:1363 msgid "piste_advanced" msgstr "büyük_meydan" @@ -18490,5 +19152,5 @@ #. #. color piste_expert -#: build/trans_style.java:1370 build/trans_style.java:1371 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" msgstr "" @@ -18503,5 +19165,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1379 build/trans_style.java:1380 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_freeride" msgstr "acemiKullanıcı_meydanı" @@ -18516,5 +19178,5 @@ #. #. color piste_novice -#: build/trans_style.java:1388 build/trans_style.java:1389 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_novice" msgstr "acemiKullanıcı_meydanı" @@ -18619,10 +19281,10 @@ #. #. -#: build/trans_style.java:1400 build/trans_style.java:1407 -#: build/trans_style.java:1416 build/trans_style.java:1424 -#: build/trans_style.java:1432 build/trans_style.java:1440 -#: build/trans_style.java:1448 build/trans_style.java:1456 -#: build/trans_style.java:1464 build/trans_style.java:1472 -#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1401 build/trans_style.java:1408 +#: build/trans_style.java:1417 build/trans_style.java:1425 +#: build/trans_style.java:1433 build/trans_style.java:1441 +#: build/trans_style.java:1449 build/trans_style.java:1457 +#: build/trans_style.java:1465 build/trans_style.java:1473 +#: build/trans_style.java:1481 build/trans_style.java:1489 msgid "power" msgstr "güç" @@ -18635,8 +19297,6 @@ #. #. -#. -#. #. color pier -#: build/trans_style.java:1531 build/trans_style.java:1532 +#: build/trans_style.java:1530 build/trans_style.java:1531 msgid "pier" msgstr "iskele" @@ -18650,5 +19310,5 @@ #. #. -#: build/trans_style.java:1540 +#: build/trans_style.java:1539 msgid "pipeline" msgstr "suhattı" @@ -18776,12 +19436,12 @@ #. #. -#: build/trans_style.java:1623 build/trans_style.java:1631 -#: build/trans_style.java:1639 build/trans_style.java:1647 -#: build/trans_style.java:1655 build/trans_style.java:1663 -#: build/trans_style.java:1679 build/trans_style.java:1687 -#: build/trans_style.java:1695 build/trans_style.java:1703 -#: build/trans_style.java:1711 build/trans_style.java:1719 -#: build/trans_style.java:1727 build/trans_style.java:1735 -#: build/trans_style.java:1743 +#: build/trans_style.java:1622 build/trans_style.java:1630 +#: build/trans_style.java:1638 build/trans_style.java:1646 +#: build/trans_style.java:1654 build/trans_style.java:1662 +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1726 build/trans_style.java:1734 +#: build/trans_style.java:1742 msgid "leisure" msgstr "dinlenme_yeri" @@ -18795,5 +19455,5 @@ #. #. -#: build/trans_style.java:1671 +#: build/trans_style.java:1670 msgid "marina" msgstr "" @@ -18865,8 +19525,8 @@ #. #. -#: build/trans_style.java:1753 build/trans_style.java:1761 -#: build/trans_style.java:1769 build/trans_style.java:1777 -#: build/trans_style.java:1785 build/trans_style.java:1793 -#: build/trans_style.java:1801 build/trans_style.java:1809 +#: build/trans_style.java:1752 build/trans_style.java:1760 +#: build/trans_style.java:1768 build/trans_style.java:1776 +#: build/trans_style.java:1784 build/trans_style.java:1792 +#: build/trans_style.java:1800 build/trans_style.java:1808 msgid "amenity" msgstr "dinlenme_yeri" @@ -18968,10 +19628,10 @@ #. #. -#: build/trans_style.java:1817 build/trans_style.java:1825 -#: build/trans_style.java:1833 build/trans_style.java:1841 -#: build/trans_style.java:1849 build/trans_style.java:1857 -#: build/trans_style.java:1865 build/trans_style.java:1873 -#: build/trans_style.java:1881 build/trans_style.java:1888 -#: build/trans_style.java:1897 build/trans_style.java:1905 +#: build/trans_style.java:1816 build/trans_style.java:1824 +#: build/trans_style.java:1832 build/trans_style.java:1840 +#: build/trans_style.java:1848 build/trans_style.java:1856 +#: build/trans_style.java:1864 build/trans_style.java:1872 +#: build/trans_style.java:1880 build/trans_style.java:1887 +#: build/trans_style.java:1896 build/trans_style.java:1904 msgid "amenity_traffic" msgstr "tail_trafiği" @@ -19357,22 +20017,22 @@ #. #. -#: build/trans_style.java:1913 build/trans_style.java:1921 -#: build/trans_style.java:1929 build/trans_style.java:1937 -#: build/trans_style.java:1945 build/trans_style.java:1953 -#: build/trans_style.java:1961 build/trans_style.java:1969 -#: build/trans_style.java:2084 build/trans_style.java:2092 -#: build/trans_style.java:2099 build/trans_style.java:2108 -#: build/trans_style.java:2116 build/trans_style.java:2124 -#: build/trans_style.java:2132 build/trans_style.java:2140 -#: build/trans_style.java:2148 build/trans_style.java:2156 -#: build/trans_style.java:2219 build/trans_style.java:2227 -#: build/trans_style.java:2235 build/trans_style.java:2244 -#: build/trans_style.java:2252 build/trans_style.java:2259 -#: build/trans_style.java:2267 build/trans_style.java:2275 -#: build/trans_style.java:2283 build/trans_style.java:2291 -#: build/trans_style.java:2299 build/trans_style.java:2307 -#: build/trans_style.java:2315 build/trans_style.java:2323 -#: build/trans_style.java:2331 build/trans_style.java:2339 -#: build/trans_style.java:2348 build/trans_style.java:2356 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2098 build/trans_style.java:2107 +#: build/trans_style.java:2115 build/trans_style.java:2123 +#: build/trans_style.java:2131 build/trans_style.java:2139 +#: build/trans_style.java:2147 build/trans_style.java:2155 +#: build/trans_style.java:2218 build/trans_style.java:2226 +#: build/trans_style.java:2234 build/trans_style.java:2243 +#: build/trans_style.java:2251 build/trans_style.java:2258 +#: build/trans_style.java:2266 build/trans_style.java:2274 +#: build/trans_style.java:2282 build/trans_style.java:2290 +#: build/trans_style.java:2298 build/trans_style.java:2306 +#: build/trans_style.java:2314 build/trans_style.java:2322 +#: build/trans_style.java:2330 build/trans_style.java:2338 +#: build/trans_style.java:2347 build/trans_style.java:2355 msgid "amenity_light" msgstr "eski_sokak_lambası" @@ -19404,6 +20064,6 @@ #. #. -#: build/trans_style.java:1977 build/trans_style.java:1985 -#: build/trans_style.java:3236 +#: build/trans_style.java:1976 build/trans_style.java:1984 +#: build/trans_style.java:3235 msgid "light_water" msgstr "su_lambası" @@ -19464,8 +20124,8 @@ #. #. -#: build/trans_style.java:2163 build/trans_style.java:2171 -#: build/trans_style.java:2179 build/trans_style.java:2188 -#: build/trans_style.java:2195 build/trans_style.java:2203 -#: build/trans_style.java:2211 +#: build/trans_style.java:2162 build/trans_style.java:2170 +#: build/trans_style.java:2178 build/trans_style.java:2187 +#: build/trans_style.java:2194 build/trans_style.java:2202 +#: build/trans_style.java:2210 msgid "health" msgstr "sağlık" @@ -19818,26 +20478,26 @@ #. #. -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2447 -#: build/trans_style.java:2455 build/trans_style.java:2463 -#: build/trans_style.java:2471 build/trans_style.java:2479 -#: build/trans_style.java:2487 build/trans_style.java:2495 -#: build/trans_style.java:2503 build/trans_style.java:2511 -#: build/trans_style.java:2519 build/trans_style.java:2527 -#: build/trans_style.java:2535 build/trans_style.java:2543 -#: build/trans_style.java:2551 build/trans_style.java:2559 -#: build/trans_style.java:2567 build/trans_style.java:2575 -#: build/trans_style.java:2583 build/trans_style.java:2591 -#: build/trans_style.java:2599 build/trans_style.java:2607 -#: build/trans_style.java:2615 build/trans_style.java:2623 -#: build/trans_style.java:2631 build/trans_style.java:2639 -#: build/trans_style.java:2647 build/trans_style.java:2655 -#: build/trans_style.java:2663 build/trans_style.java:2671 -#: build/trans_style.java:2679 build/trans_style.java:2687 -#: build/trans_style.java:2695 build/trans_style.java:2703 -#: build/trans_style.java:2712 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 build/trans_style.java:2398 +#: build/trans_style.java:2406 build/trans_style.java:2414 +#: build/trans_style.java:2422 build/trans_style.java:2430 +#: build/trans_style.java:2438 build/trans_style.java:2446 +#: build/trans_style.java:2454 build/trans_style.java:2462 +#: build/trans_style.java:2470 build/trans_style.java:2478 +#: build/trans_style.java:2486 build/trans_style.java:2494 +#: build/trans_style.java:2502 build/trans_style.java:2510 +#: build/trans_style.java:2518 build/trans_style.java:2526 +#: build/trans_style.java:2534 build/trans_style.java:2542 +#: build/trans_style.java:2550 build/trans_style.java:2558 +#: build/trans_style.java:2566 build/trans_style.java:2574 +#: build/trans_style.java:2582 build/trans_style.java:2590 +#: build/trans_style.java:2598 build/trans_style.java:2606 +#: build/trans_style.java:2614 build/trans_style.java:2622 +#: build/trans_style.java:2630 build/trans_style.java:2638 +#: build/trans_style.java:2646 build/trans_style.java:2654 +#: build/trans_style.java:2662 build/trans_style.java:2670 +#: build/trans_style.java:2678 build/trans_style.java:2686 +#: build/trans_style.java:2694 build/trans_style.java:2702 +#: build/trans_style.java:2711 msgid "shop" msgstr "alışveriş" @@ -19909,8 +20569,8 @@ #. #. -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2737 build/trans_style.java:2745 +#: build/trans_style.java:2753 build/trans_style.java:2761 +#: build/trans_style.java:2769 build/trans_style.java:2777 msgid "hotel" msgstr "hotel" @@ -20060,9 +20720,9 @@ #. #. -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2827 build/trans_style.java:2835 -#: build/trans_style.java:2851 build/trans_style.java:2922 +#: build/trans_style.java:2785 build/trans_style.java:2793 +#: build/trans_style.java:2801 build/trans_style.java:2809 +#: build/trans_style.java:2817 build/trans_style.java:2825 +#: build/trans_style.java:2826 build/trans_style.java:2834 +#: build/trans_style.java:2850 build/trans_style.java:2921 msgid "tourism" msgstr "turizm" @@ -20134,8 +20794,8 @@ #. #. -#: build/trans_style.java:2932 build/trans_style.java:2940 -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2979 build/trans_style.java:2987 msgid "historic" msgstr "tarihi" @@ -20206,8 +20866,8 @@ #. #. -#: build/trans_style.java:2997 build/trans_style.java:3005 -#: build/trans_style.java:3013 build/trans_style.java:3021 -#: build/trans_style.java:3069 build/trans_style.java:3077 -#: build/trans_style.java:3175 build/trans_style.java:3183 +#: build/trans_style.java:2996 build/trans_style.java:3004 +#: build/trans_style.java:3012 build/trans_style.java:3020 +#: build/trans_style.java:3068 build/trans_style.java:3076 +#: build/trans_style.java:3174 build/trans_style.java:3182 msgid "green" msgstr "yeşil" @@ -20221,5 +20881,5 @@ #. #. -#: build/trans_style.java:3029 +#: build/trans_style.java:3028 msgid "quarry" msgstr "taş_ocağı" @@ -20233,5 +20893,5 @@ #. #. -#: build/trans_style.java:3037 +#: build/trans_style.java:3036 msgid "landfill" msgstr "toprak_doldurma" @@ -20253,5 +20913,5 @@ #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 +#: build/trans_style.java:3044 build/trans_style.java:3052 msgid "basin" msgstr "havza" @@ -20265,5 +20925,5 @@ #. #. -#: build/trans_style.java:3061 +#: build/trans_style.java:3060 msgid "forest" msgstr "orman" @@ -20277,5 +20937,5 @@ #. #. -#: build/trans_style.java:3093 +#: build/trans_style.java:3092 msgid "farmyard" msgstr "çiftlik" @@ -20298,5 +20958,5 @@ #. #. -#: build/trans_style.java:3102 build/trans_style.java:3110 +#: build/trans_style.java:3101 build/trans_style.java:3109 msgid "retail" msgstr "perakende" @@ -20310,5 +20970,5 @@ #. #. -#: build/trans_style.java:3118 +#: build/trans_style.java:3117 msgid "industrial" msgstr "endüstri" @@ -20322,5 +20982,5 @@ #. #. -#: build/trans_style.java:3126 +#: build/trans_style.java:3125 msgid "brownfield" msgstr "ağaçsız_alan" @@ -20334,5 +20994,5 @@ #. #. -#: build/trans_style.java:3134 +#: build/trans_style.java:3133 msgid "greenfield" msgstr "yeşil_alan" @@ -20346,5 +21006,5 @@ #. #. -#: build/trans_style.java:3142 +#: build/trans_style.java:3141 msgid "railland" msgstr "demiryolu" @@ -20401,7 +21061,7 @@ #. #. -#: build/trans_style.java:3159 build/trans_style.java:3194 -#: build/trans_style.java:3202 build/trans_style.java:3210 -#: build/trans_style.java:3218 build/trans_style.java:3226 +#: build/trans_style.java:3158 build/trans_style.java:3193 +#: build/trans_style.java:3201 build/trans_style.java:3209 +#: build/trans_style.java:3217 build/trans_style.java:3225 msgid "military" msgstr "askeri" @@ -20415,5 +21075,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3166 msgid "cemetery" msgstr "mezarlık" @@ -20426,5 +21086,5 @@ #. #. -#: build/trans_style.java:3243 +#: build/trans_style.java:3242 msgid "peak" msgstr "zirve" @@ -20439,5 +21099,5 @@ #. #. -#: build/trans_style.java:3252 +#: build/trans_style.java:3251 msgid "glacier" msgstr "buzul" @@ -20451,5 +21111,5 @@ #. #. -#: build/trans_style.java:3260 +#: build/trans_style.java:3259 msgid "volcano" msgstr "volkanik" @@ -20504,8 +21164,8 @@ #. #. -#: build/trans_style.java:3268 build/trans_style.java:3269 -#: build/trans_style.java:3277 build/trans_style.java:3293 -#: build/trans_style.java:3366 build/trans_style.java:3374 -#: build/trans_style.java:3382 +#: build/trans_style.java:3267 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3292 +#: build/trans_style.java:3365 build/trans_style.java:3373 +#: build/trans_style.java:3381 msgid "natural" msgstr "doğal" @@ -20519,5 +21179,5 @@ #. #. -#: build/trans_style.java:3285 +#: build/trans_style.java:3284 msgid "scrub" msgstr "çalılık" @@ -20531,5 +21191,5 @@ #. #. -#: build/trans_style.java:3301 +#: build/trans_style.java:3300 msgid "heath" msgstr "çalılık" @@ -20543,5 +21203,5 @@ #. #. -#: build/trans_style.java:3309 +#: build/trans_style.java:3308 msgid "wood" msgstr "orman" @@ -20555,5 +21215,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3349 msgid "mud" msgstr "çamur" @@ -20567,5 +21227,5 @@ #. #. -#: build/trans_style.java:3358 +#: build/trans_style.java:3357 msgid "beach" msgstr "sahil" @@ -20643,8 +21303,8 @@ #. #. -#: build/trans_style.java:3398 build/trans_style.java:3406 -#: build/trans_style.java:3414 build/trans_style.java:3422 -#: build/trans_style.java:3430 build/trans_style.java:3438 -#: build/trans_style.java:3446 build/trans_style.java:3454 +#: build/trans_style.java:3397 build/trans_style.java:3405 +#: build/trans_style.java:3413 build/trans_style.java:3421 +#: build/trans_style.java:3429 build/trans_style.java:3437 +#: build/trans_style.java:3445 build/trans_style.java:3453 msgid "route" msgstr "rut" @@ -20692,7 +21352,7 @@ #. #. -#: build/trans_style.java:3464 build/trans_style.java:3472 -#: build/trans_style.java:3480 build/trans_style.java:3488 -#: build/trans_style.java:3496 +#: build/trans_style.java:3463 build/trans_style.java:3471 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 msgid "boundary" msgstr "sınırlar" @@ -20834,10 +21494,10 @@ #. #. -#: build/trans_style.java:3920 build/trans_style.java:3928 -#: build/trans_style.java:3936 build/trans_style.java:3944 -#: build/trans_style.java:3952 build/trans_style.java:3960 -#: build/trans_style.java:3968 build/trans_style.java:3976 -#: build/trans_style.java:3984 build/trans_style.java:3992 -#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:3919 build/trans_style.java:3927 +#: build/trans_style.java:3935 build/trans_style.java:3943 +#: build/trans_style.java:3951 build/trans_style.java:3959 +#: build/trans_style.java:3967 build/trans_style.java:3975 +#: build/trans_style.java:3983 build/trans_style.java:3991 +#: build/trans_style.java:3999 build/trans_style.java:4007 msgid "place" msgstr "yer" @@ -20885,6 +21545,6 @@ #. #. -#: build/trans_style.java:4125 build/trans_style.java:4132 -#: build/trans_style.java:4139 build/trans_style.java:4146 +#: build/trans_style.java:4124 build/trans_style.java:4131 +#: build/trans_style.java:4138 build/trans_style.java:4145 msgid "address" msgstr "adres" @@ -21115,10 +21775,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Hava Haritası aç" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg #. fails with division by zero error #: build/trans_wms.java:8 @@ -21166,4 +21826,31 @@ msgstr "Streets NRW Geofabrik.de" +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms +#. Terraserver USCG- High resolution maps +#: build/trans_wms.java:22 +msgid "Terraserver Topo" +msgstr "" + +#. 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 "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xml veya Wiki Pages ekle." + +#~ msgid "Commit comment" +#~ 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 "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -21173,10 +21860,4 @@ #~ "oynat.Seçim:Klik" -#~ msgid "Commit comment" -#~ msgstr "Açıklamayı Kabul Ediniz" - -#~ msgid "Navigation" -#~ msgstr "Navigasyon" - #~ msgid "Charge" #~ msgstr "Para Değişim" @@ -21188,4 +21869,13 @@ #~ 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 "Drawbridge" #~ msgstr "Asma Köprü" @@ -21197,4 +21887,21 @@ #~ 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 "" +#~ "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 "viaduct" #~ msgstr "viyadük"