Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 15194) +++ 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"