Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 17485)
+++ applications/editors/josm/i18n/po/sv.po	(revision 17595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-06 13:51+0200\n"
-"PO-Revision-Date: 2009-08-04 10:57+0000\n"
-"Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
+"POT-Creation-Date: 2009-09-12 18:11+0200\n"
+"PO-Revision-Date: 2009-09-09 10:16+0000\n"
+"Last-Translator: Mattias Dalkvist <dalkvist@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\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-09-06 11:38+0000\n"
+"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:193
+#: ../core/src/org/openstreetmap/josm/Main.java:194
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:203
+#: ../core/src/org/openstreetmap/josm/Main.java:204
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,18 +32,20 @@
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:296
+#: ../core/src/org/openstreetmap/josm/Main.java:297
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:534
+#: ../core/src/org/openstreetmap/josm/Main.java:298
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/Main.java:519
+#: ../core/src/org/openstreetmap/josm/Main.java:543
+#: ../core/src/org/openstreetmap/josm/Main.java:551
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -59,8 +61,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
@@ -74,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -83,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
@@ -101,54 +103,53 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "Fel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/Main.java:446
+#, java-format
 msgid ""
 "There are unsaved changes in {0} layer. Discard the changes and continue?"
 msgid_plural ""
 "There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
-msgstr[1] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:452
+msgstr[0] ""
+"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
+msgstr[1] ""
+"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:453
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "Kassera och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
@@ -157,11 +158,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
@@ -175,20 +177,20 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:477
+#: ../core/src/org/openstreetmap/josm/Main.java:478
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:478
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:479
+#: ../core/src/org/openstreetmap/josm/Main.java:498
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,16 +207,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
@@ -244,15 +246,17 @@
 msgstr "Varning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:496
+#: ../core/src/org/openstreetmap/josm/Main.java:497
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:509
-#: ../core/src/org/openstreetmap/josm/Main.java:533
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/Main.java:518
+#: ../core/src/org/openstreetmap/josm/Main.java:542
+#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Kunde inte läsa filen ''{0}''.<br> Felet är: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -339,5 +343,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
 msgstr "Insticksmoduler"
@@ -352,20 +356,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to info or history "
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för "
-"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to user page for OSM "
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för "
-"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -384,9 +384,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Välj ett mål lager."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "Välj ett mål lager."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
 msgid "Merge"
-msgstr ""
+msgstr "Sammanfoga"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -402,8 +402,10 @@
 "</html>"
 msgstr ""
+"<html>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas med.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
 msgid "No target layers"
-msgstr ""
+msgstr "Inga mål lager"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -474,9 +476,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -510,6 +512,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -528,11 +530,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
 msgstr "Information"
@@ -554,5 +556,5 @@
 msgstr "Välj åtminstone tre noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
 #, java-format
 msgid ""
@@ -563,10 +565,10 @@
 "är {0}, max är {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
 msgid "API Capabilities Violation"
 msgstr "Bryter mot API:ns möjligheter"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
 #, java-format
 msgid ""
@@ -577,5 +579,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
 #, java-format
 msgid ""
@@ -586,9 +588,9 @@
 "tillåtna längden ({2}). Värdets längd är {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
 msgid "Precondition Violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -644,76 +646,60 @@
 msgstr "Det finns inte några konflikter att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine Way"
 msgstr "Slå ihop sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 msgid "Combine several ways into one."
 msgstr "Förena flera sträckor till en enda."
 
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58
+msgid "Combine ways with different memberships?"
+msgstr "Slå ihop sträckor med olika roller?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+msgid "Combine Anyway"
+msgstr "Slå ihop i alla fall"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
+msgid ""
+"The selected ways have differing relation memberships.  Do you still want to "
+"combine them?"
+msgstr ""
+"De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+msgid "Change directions?"
+msgstr "Ändra riktning?"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+msgid "Reverse and Combine"
+msgstr "Byt riktning och slå ihop"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr ""
+"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på "
+"några av dem?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
+msgid ""
+"Could not combine ways (They could not be merged into a single string of "
+"nodes)"
+msgstr ""
+"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av "
+"noder av dem)"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#, java-format
+msgid "Combine {0} ways"
+msgstr "Slå ihop {0} sträckor"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
-msgid "Combine ways with different memberships?"
-msgstr "Slå ihop sträckor med olika roller?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-msgid "Combine Anyway"
-msgstr "Slå ihop i alla fall"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
-msgid ""
-"The selected ways have differing relation memberships.  Do you still want to "
-"combine them?"
-msgstr ""
-"De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-msgid "Change directions?"
-msgstr "Ändra riktning?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-msgid "Reverse and Combine"
-msgstr "Byt riktning och slå ihop"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159
-msgid ""
-"The ways can not be combined in their current directions.  Do you want to "
-"reverse some of them?"
-msgstr ""
-"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på "
-"några av dem?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
-msgid "Enter values for all conflicts."
-msgstr "Ange värden för alla konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Solve Conflicts"
-msgstr "Jämka konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#, java-format
-msgid "Combine {0} ways"
-msgstr "Slå ihop {0} sträckor"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
-msgid "All the ways were empty"
-msgstr "Alla sträckor var tomma"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309
-msgid ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
-msgstr ""
-"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av "
-"noder av dem)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
@@ -742,5 +728,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "Noderna är inte i en cirkel. Avbryter."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
@@ -769,5 +755,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
 msgstr "Ta bort"
@@ -777,15 +763,15 @@
 msgstr "Ta bort valda objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
 msgid "File exists. Overwrite?"
 msgstr "Filen existerar redan. Vill du skriva över?"
@@ -814,10 +800,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #, java-format
 msgid "File: {0}"
@@ -834,13 +820,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Laddar ner referenser från OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
+"Laddar ner de primitiva som refererar till en av dem markerade primitiva"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 msgid "Download referrers..."
-msgstr ""
+msgstr "Laddar ner referenser..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
@@ -848,5 +835,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, java-format
@@ -856,5 +843,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
 msgid "Conflicts during download"
-msgstr ""
+msgstr "Konflikter under nerladdningen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
@@ -889,7 +876,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
-#, fuzzy
 msgid "All Formats"
-msgstr "Alla bilder"
+msgstr "Alla format"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -923,5 +909,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "Export GPX file"
-msgstr ""
+msgstr "Exportera till GPX fil"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
@@ -1020,1066 +1006,31 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge layer"
-msgstr ""
+msgstr "Sammanfoga lagren"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+msgstr "Sammafoga det nuvarande lagret med ett annat"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge Nodes"
 msgstr "Slå ihop noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 msgid "Merge nodes into the oldest one."
 msgstr "Slå ihop noder med den äldsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
 msgid "Please select at least two nodes to merge."
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
-msgid "Merge nodes with different memberships?"
-msgstr "Slå ihop noder med olika medlemskap?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-msgid "Merge Anyway"
-msgstr "Slå ihop i alla fall"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-msgid ""
-"The selected nodes have differing relation memberships.  Do you still want "
-"to merge them?"
-msgstr ""
-"De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-"Det går inte att slå ihop noderna: En väg som fortfarande används skulle "
-"behöva tas bort."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "Slå ihop {0} noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "Spegel"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "Spegla markerade noder och sträckor."
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "Markera minst en nod eller sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "upp"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "Flytta objekt {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "ned"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "vänster"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "höger"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "Flytta {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "Flytta objekt {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-msgid "Cannot move objects outside of the world."
-msgstr "Kan inte flytta objekt utanför världen."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
-msgid "New"
-msgstr "Ny"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "Skapa ny karta"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open..."
-msgstr "Öppna..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-msgid "Open a file."
-msgstr "Öppna en fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65
-#, fuzzy
-msgid "Opening files"
-msgstr "Öppna en fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84
-#, fuzzy, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr "Okänd roll ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "Öppna plats..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "Öppna en URL."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "Skilda lager"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "Ange URL att hämta:"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "Hämta plats"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Download URL"
-msgstr "Hämta URL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "Räta upp form"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "Enbart två noder kan vara valda"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "Urvalet måste bestå uteslutande av sträckor."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "Enbart en nod vald"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "Räta upp"
-
-#: ../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:113
-msgid "Paste"
-msgstr "Klistra in"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "Klistra in innehållet i inklistringsbuffern"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "Klistra in taggar"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
-"Sätt taggarna som finns på innehållet i inklistringbuffern på alla valda "
-"föremål."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116
-#, fuzzy, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] "Hämtar {0}"
-msgstr[1] "Hämtar {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117
-#, fuzzy, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] "Ångra radering av {0} primitiv"
-msgstr[1] "Ångra radering av {0} primitiv"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "Inställningar..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "Öppna en inställningssida för globala inställningar."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "Inställningar"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "Återställ"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Gör om den senaste ogjorda handlingen."
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "Byt namn på lager"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "Byt också namn på filen"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "Ändra riktning på sträckor"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "Ändra riktningen på alla valda sträckor."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "Välj åtminstone en sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "Ändra riktning på sträckor"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
-msgid "Save"
-msgstr "Spara"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
-msgid "Save the current data."
-msgstr "Spara nuvarande data."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "Fil {0} existerar redan. Skriv över?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Empty document"
-msgstr "Tomt dokument"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "The document contains no data."
-msgstr "Dokumentet innehåller inte någon data."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Save anyway"
-msgstr "Spara i alla fall"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
-msgid "Conflicts"
-msgstr "Konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Det finns olösta konflikter. Konflikter sparas inte och kommer att behandlas "
-"som om du avvisat dem alla. Fortsätt?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-msgid "Reject Conflicts and Save"
-msgstr "Avvisa konflikter och spara"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
-msgid "Save OSM file"
-msgstr "Spara OSM-fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
-msgid "Save GPX file"
-msgstr "Spara GPX-fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
-msgid "Save Layer"
-msgstr "Spara Lager"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
-msgid "Save As..."
-msgstr "Spara som..."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
-msgid "Save the current data to a new file."
-msgstr "Spara nuvarande data i en ny fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "Välj allt"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Välj alla icke borttagna objekt i datalagret. Detta väljer även ut "
-"ofullständiga objekt."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "Visa statusrapport"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Visa statusrapport med information som kan vara av nytta vid felrapportering."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "Hjälp: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr "Statusrapport"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-msgid "Copy to clipboard and close"
-msgstr "Kopiera till urklipp och stäng"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Close"
-msgstr "Stäng"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "Dela sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "Dela sträckan vid vald nod."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "Det går inte att dela baserat på nuvarande urval."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Den valda noden ligger inte inuti någon sträcka."
-msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] ""
-"Det finns mer än en sträcka som använder sig av den nod du valt. Välj även "
-"sträckan."
-msgstr[1] ""
-"Det finns mer än en sträcka som använder sig av de noder du valt. Välj även "
-"sträckan."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "De valda noderna ingår inte i samma sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Den valda sträckan innehåller inte den valda noden."
-msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"Sträckan kan inte delas vid de valda noderna. (Tips: Välj noder mitt på "
-"sträckan.)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "Dela sträcka {0} i {1} delar"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-#, fuzzy
-msgid "Close current changeset"
-msgstr "Stänger ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#, fuzzy
-msgid "Close the current changeset ..."
-msgstr "Stänger ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-#, fuzzy
-msgid "No open changeset"
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-#, fuzzy
-msgid "Closing changeset"
-msgstr "Stänger ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "Alternera gpx-linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "Rita linjer mellan råa gps-punkter."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-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
-msgid "UnGlue Ways"
-msgstr "Frigör sträckor"
-
-#: ../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:82
-msgid "This node is not glued to anything else."
-msgstr "Denna nod är inte bunden till något annat."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "Ingen av dessa noder hänger ihop med någonting annat."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "Det nuvarande urvalet kan inte användas för att frigöra något."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "Välj antingen:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr "* En nod med tagg, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "* En nod som används av mer än en sträcka, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One 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:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-"* En sträcka och en eller flera av dess noder som används av mer än en "
-"sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"OBS: Om en sträcka är vald, så kommer denna sträcka att få ny kopior av de "
-"frigjorda\n"
-"noderna och dessa nya noder som att vara valda. Annars så kommer alla "
-"sträckor att\n"
-"få sina egna kopior och alla noder kommer att vara valda."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "Frigjord nod"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr "Duplicera till {0} noder"
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Duplicera {0} noder till {1} noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "Ångra"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Ångra senaste åtgärden."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "Avmarkera alla"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "Avmarkera alla objekt."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr "Avmarkera allt (fokus)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr "Avmarkera allt (Escape)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "Uppdatera data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)"
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "No current dataset found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
-msgid "Update Selection"
-msgstr "Uppdatera markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
-msgid "Updates the currently selected primitives from the server"
-msgstr "Uppdatera markerade primitiv från servern"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
-msgid "There are no selected primitives to update."
-msgstr "Det finns inga markerade primitiv att uppdatera."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "Selection empty"
-msgstr "Tom markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
-msgid "Upload to OSM..."
-msgstr "Skicka in till OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-msgid "Upload all changes to the OSM server."
-msgstr "Skicka in alla ändringar till OSM-servern."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#, fuzzy, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.<html>"
-msgstr "Det finns olösta konflikter. Du måste lösa dessa först."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
-msgid "Nothing to upload. Get some data first."
-msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
-msgid "No changes to upload."
-msgstr "Det finns inte några ändringar att skicka in."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "Synkronisera enbart {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
-msgid "Synchronize entire dataset"
-msgstr "Synkronisera hela datasetet"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
-msgid "Conflict detected"
-msgstr "Konflikt upptäkt"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr "oförväntat returvärde. Erhöll {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Uppladdning <strong>misslyckades</strong eftersom servern har en nyare "
-"version<br>av någon av dina noder, vägar eller relationer.<br><br>Klicka på "
-"<strong>{0}</strong> för att synkronisera all lokal data med servern."
-"<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta redigera."
-"<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347
-#, java-format
-msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405
-msgid "Upload to OSM API failed"
-msgstr "Uppladningen till OSM API misslyckades"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427
-msgid "Updating primitive"
-msgstr "Uppdaterar primitiv"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474
-msgid "Upload these changes?"
-msgstr "Skicka in dessa ändringar?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-msgid "Upload Changes"
-msgstr "Skicka in ändringar"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658
-#, fuzzy
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Lägg till en ny nod i en befintlig sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680
-msgid "upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731
-#, fuzzy
-msgid "Settings"
-msgstr "Kartinställningar"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936
-msgid "Tags of new changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755
-msgid "Objects to add:"
-msgstr "Nya objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761
-msgid "Objects to modify:"
-msgstr "Ändrade objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767
-msgid "Objects to delete:"
-msgstr "Borttagna objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803
-#, fuzzy, java-format
-msgid "{0} object to add:"
-msgid_plural "{0} objects to add:"
-msgstr[0] "Nya objekt:"
-msgstr[1] "Nya objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812
-#, fuzzy, java-format
-msgid "{0} object to modifiy:"
-msgid_plural "{0} objects to modify:"
-msgstr[0] "Ändrade objekt:"
-msgstr[1] "Ändrade objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821
-#, fuzzy, java-format
-msgid "{0} object to delete:"
-msgid_plural "{0} objects to delete:"
-msgstr[0] "Borttagna objekt:"
-msgstr[1] "Borttagna objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942
-#, fuzzy, java-format
-msgid "Tags of changeset {0}"
-msgstr "Senast ändrad {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "Zooma in"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "Zooma ut"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "Tillbaka"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "Hoppa tillbaka."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "Ljud: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "Snabbare"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "Snabbare framåt"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "Framåt"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "Hoppa framåt"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "Nästa markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "Spela upp nästa markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "Spela/pausa"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "Spela/pausa ljud."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "Föregående markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "Spela upp föregående markering"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "Långsammare"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "Långsammare framåt"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
-msgid "Downloading GPS data"
-msgstr "Hämtar GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
-msgid "Downloaded GPX Data"
-msgstr "Hämtade GPX-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
-msgid "Raw GPS data"
-msgstr "Rå GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "Hämtar data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119
-msgid "No data imported."
-msgstr "Ingen data importerad."
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "Laddar ner {0} av {1} ({2} kvar)"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110
-msgid "Errors during Download"
-msgstr "Fel under nedladdning"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>Det finns {0} primitiver i din data som kanske<br> är borttagna från "
-"servern. Om du senare försöker ta bort eller<br> uppdatera de från servern "
-"kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på <strong>{1}"
-"</strong> för att kontrollera statusen på dessa primitiv<br> på servern."
-"<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191
-msgid "Deleted or moved primitives"
-msgstr "Raderade eller flyttade primitiv"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "Borttagningsläge"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "Ta bort noder eller sträckor"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "Läge: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Klicka för att ta bort. Skift: ta bort delsträcka. Alt: lämna kvar oanvända "
-"noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit"
-
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -2090,7 +1041,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
@@ -2099,6 +1051,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -2129,4 +1081,908 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr ""
+"Det går inte att slå ihop noderna: En väg som fortfarande används skulle "
+"behöva tas bort."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Slå ihop {0} noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+msgid "Merge selection"
+msgstr "Sammanfoga markeringen"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+msgid "Merge the currently selected primitives into another layer"
+msgstr "Sammanfoga de markerade primitiva med ett annat lager"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "Spegel"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "Spegla markerade noder och sträckor."
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "Markera minst en nod eller sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "upp"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "Flytta objekt {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "ned"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "vänster"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "höger"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "Flytta {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Flytta objekt {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "Kan inte flytta objekt utanför världen."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+msgid "New"
+msgstr "Ny"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "Skapa ny karta"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "Öppna..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "Öppna en fil."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr "Öppnar filer"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "Öppnar fil ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+msgid "Open Location..."
+msgstr "Öppna plats..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+msgid "Open an URL."
+msgstr "Öppna en URL."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
+msgid "Separate Layer"
+msgstr "Skilda lager"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
+msgid "Enter URL to download:"
+msgstr "Ange URL att hämta:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
+msgid "Download Location"
+msgstr "Hämta plats"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+msgid "Download URL"
+msgstr "Hämta URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+msgid "Orthogonalize Shape"
+msgstr "Räta upp form"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+msgid "Only two nodes allowed"
+msgstr "Enbart två noder kan vara valda"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Selection must consist only of ways."
+msgstr "Urvalet måste bestå uteslutande av sträckor."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+msgid "Please select one or more closed ways of at least four nodes."
+msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+"<html>Du använder EPSG:4326 projektionen som kan leda<br>till icke önskvärd "
+"resultat vid rektangulära alignments.<br>Ändra projektionen för att få bort "
+"denna varning.<br>Vill du fortsätta?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
+msgid "Only one node selected"
+msgstr "Enbart en nod vald"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
+msgid "Orthogonalize"
+msgstr "Räta upp"
+
+#: ../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:112
+msgid "Paste"
+msgstr "Klistra in"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "Klistra in innehållet i inklistringsbuffern"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "Klistra in taggar"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr ""
+"Sätt taggarna som finns på innehållet i inklistringbuffern på alla valda "
+"föremål."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "Klistrar in {0} tag"
+msgstr[1] "Klistrar in {0} tagar"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "till {0} primitiva"
+msgstr[1] "till {0} primitiva"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "Inställningar..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "Öppna en inställningssida för globala inställningar."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "Återställ"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Gör om den senaste ogjorda handlingen."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "Byt namn på lager"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "Byt också namn på filen"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "Kunde inte döpa om filen ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "Ändra riktning på sträckor"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "Ändra riktningen på alla valda sträckor."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "Välj åtminstone en sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "Ändra riktning på sträckor"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
+msgid "Save"
+msgstr "Spara"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
+msgid "Save the current data."
+msgstr "Spara nuvarande data."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "Fil {0} existerar redan. Skriv över?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "Hittade ingen exportör! Sparede ingenting."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "Tomt dokument"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "Spara i alla fall"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "Dokumentet innehåller inte någon data."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "Konflikter"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "Avvisa konflikter och spara"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Det finns olösta konflikter. Konflikter sparas inte och kommer att behandlas "
+"som om du avvisat dem alla. Fortsätt?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "Spara OSM-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "Spara GPX-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "Spara Lager"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
+msgid "Save As..."
+msgstr "Spara som..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
+msgid "Save the current data to a new file."
+msgstr "Spara nuvarande data i en ny fil."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "Välj allt"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"Välj alla icke borttagna objekt i datalagret. Detta väljer även ut "
+"ofullständiga objekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Visa statusrapport"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr ""
+"Visa statusrapport med information som kan vara av nytta vid felrapportering."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "Hjälp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+msgid "Status Report"
+msgstr "Statusrapport"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+msgid "Copy to clipboard and close"
+msgstr "Kopiera till urklipp och stäng"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "Stäng"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "Dela sträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "Dela sträckan vid vald nod."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "Det går inte att dela baserat på nuvarande urval."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Den valda noden ligger inte inuti någon sträcka."
+msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+"Det finns mer än en sträcka som använder sig av den nod du valt. Välj även "
+"sträckan."
+msgstr[1] ""
+"Det finns mer än en sträcka som använder sig av de noder du valt. Välj även "
+"sträckan."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "De valda noderna ingår inte i samma sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "Den valda sträckan innehåller inte den valda noden."
+msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"Sträckan kan inte delas vid de valda noderna. (Tips: Välj noder mitt på "
+"sträckan.)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Dela sträcka {0} i {1} delar"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
+msgid "Close current changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+msgid "Close the current changeset ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
+msgid "There is currently no changeset open."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "Alternera gpx-linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Rita linjer mellan råa gps-punkter."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+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
+msgid "UnGlue Ways"
+msgstr "Frigör sträckor"
+
+#: ../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:82
+msgid "This node is not glued to anything else."
+msgstr "Denna nod är inte bunden till något annat."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "Ingen av dessa noder hänger ihop med någonting annat."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "Det nuvarande urvalet kan inte användas för att frigöra något."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "Välj antingen:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr "* En nod med tagg, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "* En nod som används av mer än en sträcka, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr ""
+"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One 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:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr ""
+"* En sträcka och en eller flera av dess noder som används av mer än en "
+"sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"OBS: Om en sträcka är vald, så kommer denna sträcka att få ny kopior av de "
+"frigjorda\n"
+"noderna och dessa nya noder som att vara valda. Annars så kommer alla "
+"sträckor att\n"
+"få sina egna kopior och alla noder kommer att vara valda."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "Frigjord nod"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "Duplicera till {0} noder"
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr "Duplicera {0} noder till {1} noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "Ångra"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Ångra senaste åtgärden."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "Avmarkera alla"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "Avmarkera alla objekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr "Avmarkera allt (fokus)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr "Avmarkera allt (Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update Data"
+msgstr "Uppdatera data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)"
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr "Laddar up data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+msgid "No current dataset found"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+msgid "Didn't find a primitive with id {0} in the current dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+msgid "Update Selection"
+msgstr "Uppdatera markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+msgid "Updates the currently selected primitives from the server"
+msgstr "Uppdatera markerade primitiv från servern"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+msgid "There are no selected primitives to update."
+msgstr "Det finns inga markerade primitiv att uppdatera."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+msgid "Selection empty"
+msgstr "Tom markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+msgid "Upload to OSM..."
+msgstr "Skicka in till OSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "Upload all changes to the OSM server."
+msgstr "Skicka in alla ändringar till OSM-servern."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#, fuzzy, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr "<html>Konflikter i lager ''{0}''.<br>Du måste lösa dem först.<html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+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:166
+msgid "No changes to upload."
+msgstr "Det finns inte några ändringar att skicka in."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "Synkronisera enbart {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+msgid "Synchronize entire dataset"
+msgstr "Synkronisera hela datasetet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+msgid "Conflict detected"
+msgstr "Konflikt upptäkt"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#, java-format
+msgid "unexpected return value. Got {0}"
+msgstr "oförväntat returvärde. Erhöll {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Uppladdning <strong>misslyckades</strong eftersom servern har en nyare "
+"version<br>av någon av dina noder, vägar eller relationer.<br><br>Klicka på "
+"<strong>{0}</strong> för att synkronisera all lokal data med servern."
+"<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta redigera."
+"<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#, java-format
+msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+msgid "Upload to OSM API failed"
+msgstr "Uppladningen till OSM API misslyckades"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+msgid "Updating primitive"
+msgstr "Uppdaterar primitiv"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "Zooma in"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "Zooma ut"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "Tillbaka"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "Hoppa tillbaka."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "Ljud: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "Snabbare"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "Snabbare framåt"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "Framåt"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "Hoppa framåt"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "Nästa markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "Spela upp nästa markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "Spela/pausa"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Spela/pausa ljud."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "Föregående markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "Spela upp föregående markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "Långsammare"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "Långsammare framåt"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
+msgid "Downloading GPS data"
+msgstr "Hämtar GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
+msgid "Downloaded GPX Data"
+msgstr "Hämtade GPX-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
+msgid "Raw GPS data"
+msgstr "Rå GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
+msgid "Downloading data"
+msgstr "Hämtar data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
+msgid "No data imported."
+msgstr "Ingen data importerad."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Laddar ner {0} av {1} ({2} kvar)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "Fel under nedladdning"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+"<html>Det finns {0} primitiver i din data som kanske<br> är borttagna från "
+"servern. Om du senare försöker ta bort eller<br> uppdatera de från servern "
+"kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på <strong>{1}"
+"</strong> för att kontrollera statusen på dessa primitiv<br> på servern."
+"<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr "Raderade eller flyttade primitiv"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "Borttagningsläge"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "Ta bort noder eller sträckor"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "Läge: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Klicka för att ta bort. Skift: ta bort delsträcka. Alt: lämna kvar oanvända "
+"noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
@@ -2241,18 +2097,18 @@
 "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Select"
 msgstr "Markera"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 msgid "Select, move and rotate objects"
 msgstr "Välj, flytta och rotera objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2261,18 +2117,18 @@
 msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Move elements"
 msgstr "Flytta element"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Flytta"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Ångra flytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#, java-format
 msgid ""
 "You moved more than {0} elements. Moving a large number of elements is often "
@@ -2280,9 +2136,6 @@
 "Really move them?"
 msgstr ""
-"Du flyttade mer än {0} element. Flytt av ett stort antal element är ofta ett "
-"fel.\n"
-"Vill du verkligen flytta på dem?"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
 msgstr ""
@@ -2409,7 +2262,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-#, fuzzy
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objektet med angiven ID"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
@@ -2462,41 +2314,41 @@
 msgstr "Sök"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Start Search"
 msgstr "Påbörja sökning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 #, 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:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 #, 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:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} sökträffar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
 #, java-format
 msgid ""
@@ -2510,40 +2362,40 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530
 msgid "Missing arguments for or."
 msgstr "Det saknas argument för eller (or)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
 msgid "Missing argument for not."
 msgstr "Det saknas argument för inte (not)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550
 msgid "Expected closing parenthesis."
 msgstr "En avslutande parentes förväntades"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Felaktigt antal parametrar för nodoperator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 #, java-format
 msgid ""
@@ -2552,5 +2404,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2587,62 +2439,62 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "Add node {0}"
-msgstr "Lägg till nod"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#, fuzzy, java-format
+#, java-format
 msgid "Add way {0}"
-msgstr "Lägg till {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Add relation {0}"
-msgstr "Relationer: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Change node {0}"
-msgstr "Ändra {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, fuzzy, java-format
+#, java-format
 msgid "Change way {0}"
-msgstr "Ändra {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, fuzzy, java-format
+#, java-format
 msgid "Change relation {0}"
-msgstr "Ändra relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "Ta bort \"{0}\" för {1} ''{2}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "Ta bort \"{0}\" för {1} ''{2}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "Ta bort \"{0}\" för {1} ''{2}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr "Sätt {0}={1} för {2} ''{3}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr "Sätt {0}={1} för {2} ''{3}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Sätt {0}={1} för {2} ''{3}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2714,30 +2566,30 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "Ta bort {0} {1}"
-msgstr[1] "Ta bort {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] "Borttagningsläge"
-msgstr[1] "Borttagningsläge"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] "Ta bort {0} {1}"
-msgstr[1] "Ta bort {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] "Ta bort från relation"
-msgstr[1] "Ta bort från relation"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
@@ -2751,20 +2603,16 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
 "from relation?</html>"
 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:213
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
 "</html>"
 msgstr ""
-"Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
-"Ta bort från relationen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2775,5 +2623,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2854,17 +2702,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Lös {0} taggninskonfliker i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "Lös {0} taggninskonfliker i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Lös {0} taggninskonfliker i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2874,17 +2722,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr "Lös versionskonfliker för {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr "Lös versionskonfliker för {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr "Lös versionskonfliker för {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
@@ -3022,9 +2870,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
 "<br> and creating a new default preference file.</html>"
-msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -3091,5 +2939,5 @@
 msgstr "Ö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #, java-format
@@ -3097,23 +2945,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 krävs. Erhöll {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
+#, fuzzy, java-format
+msgid "paramete''{0}'' must not be null"
+msgstr "parametern ''{0}'' får inte vara null"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
+#, fuzzy, java-format
+msgid "unsupported value ''{0}'' or parameter ''{1}''"
+msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Error: {0}"
 msgstr "Fel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Warning: {0}"
 msgstr "Varning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#, fuzzy, java-format
+msgid "expected id >= 0. Got {0}"
+msgstr "oförväntat returvärde. Erhöll {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#, fuzzy, java-format
+msgid "id > 0 expected. Got {0}"
+msgstr "oförväntat returvärde. Erhöll {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#, java-format
+msgid "version > 0 expected. Got {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
 #, java-format
@@ -3126,11 +2999,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
 "tag collection can't be applied to a primitive because there are keys with "
 "multiple values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
+msgid "can't add node {0} to incomplete way {1}"
 msgstr ""
 
@@ -3181,9 +3059,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3192,118 +3070,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
 msgid "Empty member in relation."
 msgstr "Tom medlem i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
 msgid "untagged"
 msgstr "otaggade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
 msgid "text"
 msgstr "text"
@@ -3326,5 +3204,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3335,5 +3213,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3344,5 +3222,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3456,5 +3334,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "railway"
 msgstr "järnväg"
@@ -3486,136 +3364,34 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
-"the server URL in your preferences and your internet connection.</html>"
-msgstr ""
-"Kunde inte upprätta anslutning till OSM servern {0}.\n"
-"Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
-"inställningar."
-
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-msgid "unknown"
-msgstr "okänd"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#, java-format
-msgid ""
-"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-"changeset will automatically be closed by the server after a timeout.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-#, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>Uppladdning till servern <strong>misslyckades</strong> eftersom "
-"dina<br> nuvarande data bryter mot ett förhandsvillkor.<br>Felmeddelandet "
-"är: <br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 msgid "Precondition violation"
 msgstr "Brott mot förhandsvillkor"
 
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+msgid "Security exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+msgid "IO Exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+msgid "Internal Server Error"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-"security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139
-msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179
-#, java-format
-msgid ""
-"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
-"problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189
-msgid "IO Exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213
-msgid "Internal Server Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
-"preferences and your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245
+#, fuzzy
+msgid "Bad Request"
+msgstr "Redigera rackets"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "Unknown host"
 msgstr "Okänd värddator"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-"<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
-"försökte<br>ta bort från servern redan är borttagen.<br><br>Felmeddelandet "
-"är:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
 msgid "Primitive already deleted"
 msgstr "Primitiv redan raderad"
@@ -3834,5 +3610,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
 msgid "Menu: {0}"
@@ -4209,4 +3985,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
@@ -4278,8 +4056,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -4404,5 +4182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63
 msgid "deleted"
 msgstr "raderad"
@@ -4462,5 +4240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "No, abort"
 msgstr ""
@@ -4502,4 +4280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
@@ -4513,5 +4292,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4617,4 +4396,40 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
+msgid "Conflicts when combining primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
+#, java-format
+msgid "Conflicts when merging nodes - merged node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#, fuzzy
+msgid "No conflicts to resolve"
+msgstr "Det finns inte några konflikter att zooma till"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgid "Cancel conflict resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgid "Apply resolved conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+msgid "Apply"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -4627,24 +4442,23 @@
 msgstr "alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr "Välj en färg"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
@@ -4652,12 +4466,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr "parametern ''{0}'' får inte vara null"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
@@ -4665,14 +4479,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 msgid "not yet decided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr "Inte implementerat ännu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
@@ -4681,17 +4496,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-#, fuzzy
 msgid "Tags from ways"
-msgstr "från sträcka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-#, fuzzy
 msgid "Tags from relations"
-msgstr "Ta bort från relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-#, fuzzy
 msgid "Conflicts in pasted tags"
-msgstr "Datakonflikter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
@@ -4715,24 +4527,8 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
-#, fuzzy
-msgid "Cancel conflict resolution"
-msgstr "Ändra upplösning"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
-#, fuzzy
-msgid "Apply resolved conflicts"
-msgstr "Jämka konflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-msgid "Apply"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
-#, fuzzy
 msgid "Paste ..."
-msgstr "Klistra in"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
@@ -4747,9 +4543,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
-#, fuzzy, java-format
+#, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "{0} sträcka"
-msgstr[1] "{0} sträckor"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "pos {0} is out of range. current number of members: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#, fuzzy
+msgid "Remove this relation member from the relation"
+msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+#, fuzzy
+msgid "Replace"
+msgstr "plats"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr ""
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+msgid "Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
+msgid "Tag modified relations with   "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "Tangent:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+#, fuzzy
+msgid "Value:"
+msgstr "Värde"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+msgid "Apply this role to all members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+#, fuzzy
+msgid "Orig. Way"
+msgstr "Enkelriktat"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+#, fuzzy
+msgid "Decision"
+msgstr "Utgåva"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4776,5 +4637,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 #, java-format
 msgid "Toggle: {0}"
@@ -4806,5 +4667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -4877,13 +4738,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Way {0}"
-msgstr "Lager: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, fuzzy, java-format
+#, java-format
 msgid "Relation {0}"
-msgstr "Relationer: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
@@ -4969,5 +4830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
 msgid "<different>"
 msgstr "<olika>"
@@ -5026,5 +4887,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
 msgstr "Lägg till"
@@ -5074,5 +4935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3109
 msgid "Relations"
 msgstr "Relationer"
@@ -5167,9 +5028,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] "Upphovsman"
-msgstr[1] "Upphovsman"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5182,15 +5043,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
-#, fuzzy
 msgid "Launches a browser with information about the user"
-msgstr "Mer information om denna funktion"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
-"VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade "
-"primitiven."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5265,5 +5123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5281,9 +5139,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
 msgid "Child Relations"
-msgstr ""
-
-#. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
-msgid "Role:"
 msgstr ""
 
@@ -5534,11 +5387,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "child.id >0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.getId() >0 expected. Got {1}"
 msgstr ""
 
@@ -5552,7 +5405,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
-#, fuzzy
 msgid "Loading parent relations"
-msgstr "Hämtar tidiga insticksmoduler"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5678,5 +5530,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2747
 msgid "Places"
 msgstr "Platser"
@@ -5754,9 +5606,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
+#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
 "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Click."
-msgstr ""
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger musknapp "
+"och flytta musen. Välj: Klicka"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5796,7 +5651,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "History for relation {0}"
-msgstr "raderar referens från relation {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -5805,7 +5660,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#, fuzzy
 msgid "Reload the history from the server"
-msgstr "Skicka in inställningar till servern"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -5853,7 +5707,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for relation {0}"
-msgstr "raderar referens från relation {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6688,52 +6542,52 @@
 #: build/trans_presets.java:2332 build/trans_presets.java:2338
 #: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2448 build/trans_presets.java:2455
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2495 build/trans_presets.java:2501
-#: build/trans_presets.java:2523 build/trans_presets.java:2530
-#: build/trans_presets.java:2537 build/trans_presets.java:2543
-#: build/trans_presets.java:2550 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2587 build/trans_presets.java:2594
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2674
-#: build/trans_presets.java:2683 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2712
-#: build/trans_presets.java:2719 build/trans_presets.java:2739
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2780
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: build/trans_presets.java:2828 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2897 build/trans_presets.java:2907
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2928 build/trans_presets.java:2933
-#: build/trans_presets.java:2939 build/trans_presets.java:2945
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2978 build/trans_presets.java:2984
-#: build/trans_presets.java:2990 build/trans_presets.java:2997
-#: build/trans_presets.java:3003 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3045 build/trans_presets.java:3051
-#: build/trans_presets.java:3057 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3089
-#: build/trans_presets.java:3095 build/trans_presets.java:3101
-#: build/trans_presets.java:3114 build/trans_presets.java:3128
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:2451 build/trans_presets.java:2458
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2498 build/trans_presets.java:2504
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2553 build/trans_presets.java:2559
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2590 build/trans_presets.java:2597
+#: build/trans_presets.java:2604 build/trans_presets.java:2610
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2677
+#: build/trans_presets.java:2686 build/trans_presets.java:2701
+#: build/trans_presets.java:2707 build/trans_presets.java:2715
+#: build/trans_presets.java:2722 build/trans_presets.java:2742
+#: build/trans_presets.java:2752 build/trans_presets.java:2758
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2783
+#: build/trans_presets.java:2790 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2824
+#: build/trans_presets.java:2831 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2851
+#: build/trans_presets.java:2858 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2885 build/trans_presets.java:2891
+#: build/trans_presets.java:2900 build/trans_presets.java:2910
+#: build/trans_presets.java:2919 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2948
+#: build/trans_presets.java:2957 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2987
+#: build/trans_presets.java:2993 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3018 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3040
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3092
+#: build/trans_presets.java:3098 build/trans_presets.java:3104
+#: build/trans_presets.java:3117 build/trans_presets.java:3131
+#: build/trans_presets.java:3145
 msgid "Name"
 msgstr "Namn"
@@ -6743,21 +6597,19 @@
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong>"
+"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
-#, fuzzy
 msgid "Changeset info"
-msgstr "Ändra relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
-#, fuzzy
 msgid "Launch browser with information about the changeset"
-msgstr "Mer information om denna funktion"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
-#, fuzzy, java-format
+#, java-format
 msgid "Show changeset {0}"
-msgstr "Senast ändrad {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6775,7 +6627,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
-#, fuzzy
 msgid "Select filename"
-msgstr "Gatunamn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6816,12 +6667,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
-#, fuzzy
 msgid "Please select a file"
-msgstr "Välj ett värde"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr "parametern ''{0}'' får inte vara null"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102
@@ -6866,5 +6716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 #, fuzzy
-msgid "Unsafed data and conflicts"
+msgid "Unsaved data and conflicts"
 msgstr "Korrigera taggkonflikter"
 
@@ -6882,5 +6732,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
-msgid "Unsafed data and missing associated file"
+msgid "Unsaved data and missing associated file"
 msgstr ""
 
@@ -6899,5 +6749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-msgid "Unsafed data non-writable files"
+msgid "Unsaved data non-writable files"
 msgstr ""
 
@@ -6911,7 +6761,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-#, fuzzy
 msgid "Discard and Delete"
-msgstr "Kassera och avsluta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -6924,7 +6773,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-#, fuzzy
 msgid "Save and Delete"
-msgstr "Spara och avsluta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
@@ -7002,7 +6850,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
-#, fuzzy
 msgid "Should upload?"
-msgstr "Vid inskickning"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
@@ -7011,17 +6858,145 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+msgid "Filename"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+msgid "Use a new changeset and close it"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid ""
+"Select to upload the data using a new changeset and to close the changeset "
+"after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Use a new changeset and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid ""
+"Select to upload the data using a new changeset and to leave the changeset "
+"open after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
+msgid "Upload to a new or to an existing changeset?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+msgid "upload all changes in one request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
+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/gui/io/UploadDialog.java:216
+msgid "Settings"
+msgstr "Inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+msgid "Tags of new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+msgid "Objects to add:"
+msgstr "Nya objekt:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+msgid "Objects to modify:"
+msgstr "Ändrade objekt:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+msgid "Objects to delete:"
+msgstr "Borttagna objekt:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#, java-format
+msgid "{0} object to modifiy:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
+#, java-format
+msgid "Use the existing changeset {0} and close it after upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to close the changeset "
+"after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
+#, java-format
+msgid "Use the existing changeset {0} and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to leave the changeset "
+"open for further uploads"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+msgid "Upload Changes"
+msgstr "Skicka in ändringar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
 #, fuzzy
-msgid "Filename"
-msgstr "Arkiv"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload the changed primitives"
+msgstr "Skicka in dessa ändringar?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
 #, fuzzy
-msgid "Upload"
-msgstr "Ladda Upp"
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Ange platsens namn."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Cancel the upload and resume editing"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
-#, fuzzy
 msgid "Preparing primitives to upload ..."
-msgstr "Det finns inga markerade primitiv att uppdatera."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7254,5 +7229,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7310,7 +7284,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
-#, fuzzy
 msgid "Download data"
-msgstr "Hämtar data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
@@ -7375,4 +7348,13 @@
 msgid "Convert to GPX layer"
 msgstr "Omvandla till gpx-lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#, fuzzy
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
+"skicka in spår, se här:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
@@ -7564,5 +7546,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
 msgstr "Välj vilken rad du vill ta bort."
@@ -8039,7 +8021,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
-#, fuzzy
 msgid "Show localized name in selection lists"
-msgstr "Visa objektens ID i urvalslistor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
@@ -8054,7 +8035,6 @@
 #. Show localized names
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
-#, fuzzy
 msgid "Show localized name in selection lists, if available"
-msgstr "Visa objektens ID i urvalslistor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
@@ -8435,8 +8415,4 @@
 msgstr "Avaktivera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
-msgid "Key:"
-msgstr "Tangent:"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8493,5 +8469,5 @@
 msgstr "<flera>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -8502,42 +8478,40 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
-#, fuzzy
 msgid "Add a new tag"
-msgstr "Lägg till ett nytt lager"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
-#, fuzzy
 msgid "Delete the selection in the tag table"
-msgstr "Ta bort valt lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Använd snabbval ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 msgid "closedway"
 msgstr "slutenväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
@@ -8548,15 +8522,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
 #, 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:702
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8566,18 +8540,18 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Change Properties"
 msgstr "Ändra egenskaper"
@@ -8604,5 +8578,4 @@
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Det saknas förmodligen några taggar."
@@ -8618,7 +8591,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
@@ -8696,5 +8666,5 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
 msgid "Markers from {0}"
@@ -8702,5 +8672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8708,5 +8678,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -8727,6 +8696,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -8736,40 +8705,40 @@
 msgstr "Hämtar OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
+#, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -8831,10 +8800,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -8842,11 +8811,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
 msgid "Creating changeset..."
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
 #, java-format
 msgid "Successfully opened changeset {0}"
@@ -8854,34 +8821,18 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-msgid "No currently open changeset. Opening a new changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
-msgid ""
-"Warning: could not reuse an existing changeset as requested. Opening a new "
-"one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
-#, fuzzy, java-format
-msgid "Reusing existing changeset {0}"
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
-#, fuzzy
 msgid "Updating changeset..."
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 #, java-format
 msgid "Changeset {0} is unchanged. Skipping update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#, java-format
 msgid "Updating changeset {0}..."
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid ""
 "Failed to update changeset. Either there is no current changeset or the id "
@@ -8889,44 +8840,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 msgid "Closing changeset..."
 msgstr "Stänger ändringssamling..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#, java-format
 msgid "Closing changeset {0}..."
-msgstr "Stänger ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#, java-format
 msgid "Leaving changeset {0} open..."
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
 msgid "Uploading..."
 msgstr "Skickar in..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
 #, java-format
 msgid "Starting retry {0} of {1}."
@@ -8945,10 +8896,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
 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
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
 msgid "Invalid bz2 file."
 msgstr ""
@@ -9007,6 +8958,11 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#, java-format
+msgid "(at line {0}, column {1})"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "OSM serverfiler"
@@ -9035,5 +8991,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
 msgid "OSM Server Files gzip compressed"
 msgstr ""
@@ -9090,74 +9046,139 @@
 msgstr "Fel vid tolkning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
-msgid "Unknown version"
-msgstr "Okänd version"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
-msgid "Version number missing from OSM data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
-#, java-format
-msgid "Unknown version: {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "Det nödvändiga attributet \"{0}\" saknas."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#, fuzzy, java-format
+msgid "Unsupported version: {0}"
+msgstr "jämkad version:"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+msgid "found XML element <nd> element not as direct child of element <way>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-msgid "Found <nd> element in non-way."
-msgstr "Hittade element av typen <nd> på icke-sträcka"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
-msgid "<nd> has zero ref"
-msgstr "<nd> har nollreferens"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
-msgid "Found <member> element in non-relation."
-msgstr "Fann <member>-tagg utanför relation."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
-#, java-format
-msgid "Missing attribute \"ref\" on member in relation {0}"
+#, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
 #, java-format
-msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
-#, java-format
-msgid "Missing attribute \"type\" on member {0} in relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
-#, java-format
-msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+msgid "Missing attribute ''ref'' on member in relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#, java-format
+msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 msgid "Illegal object with id=0"
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
-#, java-format
-msgid ""
-"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
-#, java-format
-msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
-#, java-format
-msgid "Missing required attribute \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.6''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#, java-format
+msgid "Unknown or unsupported API version. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#, java-format
+msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#, fuzzy, java-format
+msgid "Missing required attribute ''{0}''."
 msgstr "Det nödvändiga attributet \"{0}\" saknas."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#, java-format
+msgid ""
+"way with external id ''{0}'' includes missing node with external id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
 #, java-format
 msgid ""
@@ -9166,16 +9187,30 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#, java-format
+msgid ""
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, java-format
-msgid "Unknown relation member type {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
+#, fuzzy, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to missing primitive with external "
+"id ''{1}''"
+msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
-msgid "Ill-formed node id"
-msgstr "Felformaterad nod-id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
+#, fuzzy
+msgid "Parsing OSM data..."
+msgstr "Förbereder OSM-data..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
+#, fuzzy
+msgid "Preparing data set..."
+msgstr "Förbereder data..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9221,33 +9256,43 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgid "Starting to upload in one request ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
+#, fuzzy
+msgid "Uploading data ..."
+msgstr "Skickar in..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgid ""
+"WARNING: no API version defined for data to upload. Falling back to version "
+"0.6"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 #, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194
-#, fuzzy
-msgid "Starting to upload in one request ..."
-msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197
-msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
@@ -9286,11 +9331,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
@@ -9303,4 +9343,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
@@ -9344,11 +9389,15 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 msgid "Disable plugin"
 msgstr "Avaktivera insticksmodul"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+msgid "Keep plugin"
+msgstr "Behåll plugin"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -9357,9 +9406,5 @@
 "inställningarna?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-msgid "Keep plugin"
-msgstr "Behåll plugin"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9369,5 +9414,9 @@
 "JOSM har behörighet att skriva över de existerande."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+msgid "<html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 #, java-format
 msgid ""
@@ -9376,10 +9425,10 @@
 "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, 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:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9388,9 +9437,9 @@
 "innan du rapporterar en bugg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
 msgid "Should the plugin be disabled?"
 msgstr "Skall insticksmodulen avaktiveras?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9400,13 +9449,13 @@
 "frigöra insticksmodulen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9463,4 +9512,35 @@
 "{0}"
 
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: build/trans_presets.java:323 build/trans_presets.java:324
+#: build/trans_presets.java:325 build/trans_presets.java:326
+#: build/trans_presets.java:327 build/trans_presets.java:328
+#: build/trans_presets.java:329 build/trans_presets.java:330
+#: build/trans_presets.java:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+msgid "unknown"
+msgstr "okänd"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
 #, java-format
@@ -9536,4 +9616,94 @@
 msgstr "(Texten finns redan i urklipp.)"
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#, java-format
+msgid ""
+"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+"changeset will automatically be closed by the server after a timeout.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Uppladdning till servern <strong>misslyckades</strong> eftersom "
+"dina<br> nuvarande data bryter mot ett förhandsvillkor.<br>Felmeddelandet "
+"är: <br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+"<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
+"försökte<br>ta bort från servern redan är borttagen.<br><br>Felmeddelandet "
+"är:<br>{0}</html>"
+
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
 #, java-format
@@ -9605,5 +9775,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104
 #, java-format
 msgid ""
@@ -9612,5 +9782,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
 #, java-format
 msgid ""
@@ -9619,5 +9789,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
 #, java-format
 msgid ""
@@ -9626,5 +9796,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
 #, java-format
 msgid ""
@@ -9633,5 +9803,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
 #, java-format
 msgid ""
@@ -9690,40 +9860,39 @@
 msgstr "Skicka in spår"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
-#, fuzzy
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
-#: build/trans_presets.java:3145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3148
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 msgid "Please enter Description about your trace."
 msgstr "Ange beskrivning för ditt spår."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
 msgid "Please enter tags about your trace."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
 #, java-format
 msgid "Selected track: {0}"
@@ -9731,47 +9900,47 @@
 
 #. Set progress dialog to indeterminate while connecting
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
 msgstr "Inskickning avbruten"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
 msgid "Error while uploading"
 msgstr "Fel vid inskickning"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 msgid "GPX upload was successful"
 msgstr "GPX-inskickning genomförd"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
 msgstr "Inskickning misslyckades. Servern returnerade följande meddelande: "
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Skickar in GPX-spår: {0}% ({1} av {2})"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
 msgid "No description provided. Please provide some description."
 msgstr "Ingen beskrivning angiven. Skriv in en beskrivning."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Inget GPX-lager valt. Kan inte skicka in ett spår."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
 msgid "No username provided."
 msgstr "Inget användarnamn angivet."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
 msgid "No password provided."
 msgstr "Inget lösenord angviet."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
 msgstr "Skickar in GPX-spår"
@@ -9991,5 +10160,5 @@
 msgstr "Bilder som inte taggats ännu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr "Sätt bilder i relation till GPX-spår"
@@ -10003,13 +10172,13 @@
 msgstr "Auto-gissa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604
 #, java-format
 msgid ""
@@ -10020,9 +10189,9 @@
 "Förväntat format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:617
 #, java-format
 msgid ""
@@ -10033,26 +10202,26 @@
 "Förväntat format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:661
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr "Hittade {0} träffar för {1} i GPX-spår {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662
 msgid "GPX Track loaded"
 msgstr "GPX-spår har hämtats"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697
 msgid "The selected photos don't contain time information."
 msgstr "De markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:698
 msgid "Photos don't contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:732
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10060,39 +10229,39 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:797
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Parade ihop {0} av {1} foton med GPX-spåret"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:800
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsdifferens om {0} dagar)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:807
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10100,13 +10269,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
 msgid "Default Values"
 msgstr "Standardinställningar"
@@ -10144,5 +10313,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
@@ -10171,11 +10340,9 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Town/city {0} not found or not available\n"
 "or action canceled"
 msgstr ""
-"Stad/ort {0} kunde inte hittas i WMS.\n"
-"Kontrollera tillgängligheten via www.cadastre.gouv.fr"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10191,13 +10358,13 @@
 msgstr "Välj en av..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10206,13 +10373,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
 #, java-format
 msgid ""
@@ -10328,9 +10495,9 @@
 msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
 msgid "Auto-tag source added:"
 msgstr "Tagg för källa har automatiskt lagts till:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
 msgid "Add \"source=...\" to elements?"
 msgstr "Lägg \"source=...\" till objekt?"
@@ -10483,7 +10650,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-#, fuzzy
 msgid "Set "
-msgstr "Markera"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -10567,5 +10733,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -11509,18 +11675,18 @@
 msgstr "Okänd status för problemfall"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
 msgstr "Öppna det som syns..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 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:56
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 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:109
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -11531,5 +11697,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -11539,9 +11705,9 @@
 "kartinställningssidan av inställningar."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "osmarender options"
 msgstr "inställningar för osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
 msgid "Firefox executable"
 msgstr "Firefox-applikationen"
@@ -11552,28 +11718,33 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#, fuzzy
+msgid "create new objects"
+msgstr "Skapa ny nod"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the selection"
 msgstr "ändra urval"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the viewport"
 msgstr "ändra vad som visas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "confirm all Remote Control actions manually"
 msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Remote Control"
 msgstr "Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Settings for the Remote Control plugin."
 msgstr "Inställningar för insticksmodulen Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -11585,28 +11756,35 @@
 "applikationer i kommunikation med insticksmodulen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#, fuzzy
+msgid "Remote Control has been asked to create a new node."
+msgstr "Fjärrstyrning har begärts för att hämta data från API"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
@@ -12108,25 +12286,33 @@
 "att det inte har uppstått några fel."
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+msgid "Enter values for all conflicts."
+msgstr "Ange värden för alla konflikter"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+msgid "Solve Conflicts"
+msgstr "Jämka konflikter"
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
 msgid "Fix tag conflicts"
 msgstr "Korrigera taggkonflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
 msgid "Removed Element from Relations"
 msgstr "Tog bort element från relation"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå ihop områden: Ta bort korta sträckor"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
 msgid "Closed Way"
 msgstr "Sluten sträcka"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
 msgid "Remove tags from inner ways"
 msgstr "Ta bort taggar från inre sträckor"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
 msgid "Join Areas Function"
 msgstr ""
@@ -12202,6 +12388,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
 msgstr "Valideringsfel"
@@ -12211,10 +12397,10 @@
 msgstr "Inga valideringsfel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
 msgstr "Rutnät"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #, java-format
 msgid ""
@@ -12305,51 +12491,65 @@
 msgstr "Utför datavalidering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "Data med fel. Skicka in ändå?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 msgid "Open the validation window."
 msgstr "Öppna valideringslistan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
 msgid "Zoom to problem"
 msgstr "Zooma till problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix"
 msgstr "Rätta till"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix the selected errors."
 msgstr "Rätta till de valda felen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
 msgstr "Ignorera de valda felen nästa gång."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Whole group"
 msgstr "Hela gruppen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Single elements"
 msgstr "Enstaka poster"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignore whole group or individual elements?"
 msgstr "Ignorera hela gruppen eller enstaka poster?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
 msgid "Ignoring elements"
 msgstr "Ignorerar poster"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+msgid "Fixing errors ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#, fuzzy
+msgid "Updating map ..."
+msgstr "Laddar up data"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12375,16 +12575,12 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
-#, fuzzy
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
-"Detta test kontrollerar om två vägar, järnvägar eller vattendrag korsar "
-"varandra i samma lager, men inte förenas med en nod."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
-#, fuzzy
 msgid "Crossing buildings"
-msgstr "Skapa byggnader"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12392,20 +12588,19 @@
 msgstr "Korsande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr "Noder med samma namn"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
 msgid "Confirmation"
 msgstr ""
@@ -12413,20 +12608,16 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
-#, fuzzy
 msgid "Duplicated ways"
-msgstr "Dubblera sträcka"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
-#, fuzzy
 msgid ""
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
 msgstr ""
-"Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
-#, fuzzy
 msgid "Delete duplicate ways"
-msgstr "Skapa en dubblett av sträcka"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13012,5 +13203,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Undantag inträffade"
@@ -13094,5 +13285,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -13100,5 +13291,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
 msgid "No valid WMS URL or id"
 msgstr ""
@@ -13116,17 +13307,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "No layers to adjust"
 msgstr ""
@@ -13167,19 +13358,18 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
-#, fuzzy
 msgid "(deactivated)"
-msgstr "avsedd för"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
 #, 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:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
 #, 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:180
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
 #, java-format
 msgid ""
@@ -13190,111 +13380,122 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194
-#, fuzzy
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr "Ogiltigt datum"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 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:284
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 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:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Menu Name"
 msgstr "Menynamn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
 msgid "WMS URL"
 msgstr "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
 msgid "Enter a menu name and WMS URL"
 msgstr "Ange ett menynamn och en URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 #, fuzzy
-msgid "Copy Selected Default(s)"
-msgstr "Kopiera förval"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+msgid "Overlap tiles"
+msgstr "Överlappande ytor."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 #, fuzzy
-msgid "Please select at least one row to copy."
-msgstr "Välj åtminstone en sträcka."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154
-msgid "Downloader:"
-msgstr ""
+msgid "% of north:"
+msgstr "norr"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13663,5 +13864,5 @@
 #: build/trans_presets.java:120 build/trans_presets.java:140
 #: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3143
+#: build/trans_presets.java:1557 build/trans_presets.java:3146
 msgid "Reference"
 msgstr "Referens"
@@ -14203,7 +14404,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "asphalt"
-msgstr "Fäbod"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14224,8 +14424,7 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
-#, fuzzy
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
 msgid "metal"
-msgstr "Uthyrning"
+msgstr ""
 
 #. color heath
@@ -14243,5 +14442,6 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_style.java:3367
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_style.java:3367
 msgid "wood"
 msgstr "skog"
@@ -14254,7 +14454,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "paving_stones"
-msgstr "parkeringsbiljetter"
+msgstr ""
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -14290,7 +14489,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "pebblestone"
-msgstr "kullersten"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14301,7 +14499,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "compacted"
-msgstr "ofullständig"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14312,7 +14509,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "grass_paver"
-msgstr "gräs"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14506,4 +14702,5 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
 #. item "Amenities/Hunting Stand" combo "Shelter"
 #. item "Amenities/Hunting Stand" combo "Hide"
@@ -14532,12 +14729,12 @@
 #: build/trans_presets.java:1398 build/trans_presets.java:1399
 #: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2397 build/trans_presets.java:2433
+#: build/trans_presets.java:2442 build/trans_presets.java:2443
+#: build/trans_presets.java:2444 build/trans_presets.java:2714
 msgid "yes"
 msgstr "ja"
 
 #. color permissive
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14585,5 +14782,5 @@
 
 #. color private
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14620,5 +14817,5 @@
 #. <rule>
 #. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14682,6 +14879,7 @@
 #: build/trans_presets.java:1399 build/trans_presets.java:1763
 #: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2439 build/trans_presets.java:2440
-#: build/trans_presets.java:2441 build/trans_presets.java:2711
+#: build/trans_presets.java:2433 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:2714
 msgid "no"
 msgstr "nej"
@@ -14827,6 +15025,6 @@
 #: build/trans_presets.java:788 build/trans_presets.java:1135
 #: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2898 build/trans_presets.java:2908
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2901 build/trans_presets.java:2911
+#: build/trans_presets.java:2920
 msgid "Type"
 msgstr "Typ"
@@ -15097,7 +15295,6 @@
 #. item "Ways/Cycleway" check "Embankment"
 #: build/trans_presets.java:449
-#, fuzzy
 msgid "Pedestrians"
-msgstr "Gågata"
+msgstr ""
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -15116,7 +15313,6 @@
 #. item "Ways/Footway" check "Embankment"
 #: build/trans_presets.java:469
-#, fuzzy
 msgid "Bikes"
-msgstr "Spikhinder"
+msgstr ""
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -15408,7 +15604,7 @@
 #: build/trans_presets.java:2384 build/trans_presets.java:2395
 #: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2461 build/trans_presets.java:2509
-#: build/trans_presets.java:2675 build/trans_presets.java:2690
-#: build/trans_presets.java:2729 build/trans_presets.java:3148
+#: build/trans_presets.java:2464 build/trans_presets.java:2512
+#: build/trans_presets.java:2678 build/trans_presets.java:2693
+#: build/trans_presets.java:2732 build/trans_presets.java:3151
 msgid "Operator"
 msgstr "Operatör"
@@ -15621,6 +15817,6 @@
 #. item "Places/Volcano" text "Name"
 #: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2842
-#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:1745 build/trans_presets.java:2845
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
 msgid "Elevation"
 msgstr "Höjd"
@@ -16532,7 +16728,4 @@
 #. item "Sport Facilities/Miniature Golf" text "Name"
 #. item "Buildings/Library" text "Name"
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
 #. item "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -16580,23 +16773,23 @@
 #: build/trans_presets.java:1818 build/trans_presets.java:1909
 #: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2433
-#: build/trans_presets.java:2462 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2250 build/trans_presets.java:2465
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -16620,5 +16813,4 @@
 #. item "Buildings/Library" combo "Opening Hours"
 #. item "Buildings/Place of Worship" combo "Opening Hours"
-#. item "Amenities/Bench" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -16665,22 +16857,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "24/7"
 msgstr ""
@@ -16695,22 +16887,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -16725,22 +16917,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16774,5 +16966,5 @@
 #: build/trans_presets.java:1391 build/trans_presets.java:1762
 #: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Reference number"
 msgstr "Referensnummer"
@@ -16792,7 +16984,6 @@
 
 #: build/trans_presets.java:1393
-#, fuzzy
 msgid "Park and Ride"
-msgstr "Markera som slutförd"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -16806,7 +16997,6 @@
 #. <space />
 #: build/trans_presets.java:1396
-#, fuzzy
 msgid "Capacity (overall)"
-msgstr "Kapacitet"
+msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
@@ -16816,12 +17006,10 @@
 
 #: build/trans_presets.java:1398
-#, fuzzy
 msgid "Spaces for Women"
-msgstr "Handikappplatser"
+msgstr ""
 
 #: build/trans_presets.java:1399
-#, fuzzy
 msgid "Spaces for Parents"
-msgstr "Handikappplatser"
+msgstr ""
 
 #: build/trans_presets.java:1400
@@ -17023,5 +17211,5 @@
 #. <separator/>
 #: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2442
 msgid "Shelter"
 msgstr "VIndskydd"
@@ -17406,7 +17594,6 @@
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "topo"
-msgstr "Stopp"
+msgstr ""
 
 #. color tertiary
@@ -17449,28 +17636,23 @@
 
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "scheme"
-msgstr "kinesiskt"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "Shown Area"
-msgstr "Hämta område"
+msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "site"
-msgstr "Klistra in"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "city"
-msgstr "Stad"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "region"
-msgstr "lokalt"
+msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -17498,7 +17680,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #: build/trans_presets.java:1727 build/trans_presets.java:1750
-#, fuzzy
 msgid "Mountainbiking"
-msgstr "Bergsvandringsled"
+msgstr ""
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -17512,7 +17693,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #: build/trans_presets.java:1729 build/trans_presets.java:1752
-#, fuzzy
 msgid "Riding"
-msgstr "sidospår"
+msgstr ""
 
 #. item "Tourism/Map" check "Riding"
@@ -17529,13 +17709,11 @@
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "Board Content"
-msgstr "Gränskontroll"
+msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "notice"
-msgstr "nybörjare"
+msgstr ""
 
 #: build/trans_presets.java:1737
@@ -17552,7 +17730,6 @@
 
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "plants"
-msgstr "markanvändning"
+msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
@@ -17563,19 +17740,16 @@
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1755
-#, fuzzy
 msgid "Information Terminal"
-msgstr "Information"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
 #: build/trans_presets.java:1760 build/trans_presets.java:1770
-#, fuzzy
 msgid "Closer description"
-msgstr "beskrivning av gps-spår"
+msgstr ""
 
 #: build/trans_presets.java:1765
-#, fuzzy
 msgid "Audioguide"
-msgstr "Ljud"
+msgstr ""
 
 #. <space />
@@ -17586,7 +17760,6 @@
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1776
-#, fuzzy
 msgid "Phone number"
-msgstr "Telefonnummer"
+msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
@@ -17910,5 +18083,5 @@
 #. <condition k="sport" v="dog_racing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="leisure/dog.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17942,5 +18115,5 @@
 #. <condition k="sport" v="gymnastics"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/multi.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19066,6 +19239,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "Religion"
 msgstr "Religion"
@@ -19074,66 +19247,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "Denomination"
 msgstr "Samfund"
@@ -19142,76 +19315,76 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "sunni"
 msgstr "sunnimuslimer"
@@ -19543,5 +19716,5 @@
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2511
+#: build/trans_presets.java:2398 build/trans_presets.java:2514
 msgid "Note"
 msgstr "Anteckning"
@@ -19566,5 +19739,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2512
+#: build/trans_presets.java:2411 build/trans_presets.java:2515
 msgid "Coins"
 msgstr "Mynt"
@@ -19572,5 +19745,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2513
+#: build/trans_presets.java:2412 build/trans_presets.java:2516
 msgid "Notes"
 msgstr "Anteckningar"
@@ -19578,5 +19751,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2514
+#: build/trans_presets.java:2413 build/trans_presets.java:2517
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -19584,5 +19757,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2515
+#: build/trans_presets.java:2414 build/trans_presets.java:2518
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -19590,5 +19763,5 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2516
+#: build/trans_presets.java:2415 build/trans_presets.java:2519
 msgid "Credit cards"
 msgstr "Kreditkort"
@@ -19647,10 +19820,144 @@
 msgstr "Bänk"
 
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2433
+#, fuzzy
+msgid "Backrest"
+msgstr "Tillbaka"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Material"
+msgstr "Minnesmärke"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "stone"
+msgstr "inget"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "plastic"
+msgstr "plats"
+
 #: build/trans_presets.java:2435
+#, fuzzy
+msgid "Colour"
+msgstr "Färg"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "black"
+msgstr "Tillbaka"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "brown"
+msgstr "ned"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_presets.java:2435 build/trans_style.java:3055
+#: build/trans_style.java:3063 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3127
+#: build/trans_style.java:3135 build/trans_style.java:3233
+#: build/trans_style.java:3241
+msgid "green"
+msgstr ""
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "red"
+msgstr "slut"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "blue"
+msgstr "Värde"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "white"
+msgstr "vatten"
+
+#: build/trans_presets.java:2436
+#, fuzzy
+msgid "Amount of Seats"
+msgstr "Antal kablar"
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2438
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -19659,30 +19966,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2438 build/trans_presets.java:2899
+#: build/trans_presets.java:2441 build/trans_presets.java:2902
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2446
 msgid "Fountain"
 msgstr "Fontän"
@@ -19691,10 +19998,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -19703,10 +20010,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2456
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Baby Hatch"
 msgstr ""
@@ -19714,35 +20021,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2462
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2468
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2469
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2472
-#, fuzzy
+#: build/trans_presets.java:2475
 msgid "Chemist"
-msgstr "Fäbod"
-
-#. item
-#: build/trans_presets.java:2473
-#, fuzzy
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2476
 msgid "Edit Chemist"
-msgstr "Redigera fäbod"
-
-#: build/trans_presets.java:2478
+msgstr ""
+
+#: build/trans_presets.java:2481
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -19750,9 +20055,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2483
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2488
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -19760,29 +20065,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2490
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2495
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2493
-#, fuzzy
+#: build/trans_presets.java:2496
 msgid "Edit Book Store"
-msgstr "Redigera en busshållplats"
-
-#: build/trans_presets.java:2498
+msgstr ""
+
+#: build/trans_presets.java:2501
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2499
-#, fuzzy
+#: build/trans_presets.java:2502
 msgid "Edit Travel Agency"
-msgstr "Redigera ett träd"
-
-#: build/trans_presets.java:2504
+msgstr ""
+
+#: build/trans_presets.java:2507
 msgid "Vending machine"
 msgstr "Automat"
@@ -19790,5 +20093,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -19796,88 +20099,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2522
 msgid "Butcher"
 msgstr "Slakteri"
@@ -19885,9 +20188,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2524
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2529
 msgid "Baker"
 msgstr "Bageri"
@@ -19895,9 +20198,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2531
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2536
 msgid "Florist"
 msgstr "Florist"
@@ -19905,18 +20208,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2538
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2543
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2544
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2549
 msgid "Alcohol"
 msgstr ""
@@ -19924,54 +20227,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2551
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2556
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2557
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2562
 msgid "Computer"
 msgstr "Dator"
 
 #. item
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2563
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2569
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2574
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2575
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2580
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2581
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -19979,9 +20282,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2588
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -19989,9 +20292,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2595
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -19999,54 +20302,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2602
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2608
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2614
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Shoes"
 msgstr "Skor"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2620
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2626
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2631
 msgid "Video"
 msgstr "Videobutik"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2632
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2637
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -20054,9 +20357,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2639
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2644
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -20064,9 +20367,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2646
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2651
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -20074,32 +20377,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2653
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2658
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2659
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2664
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2665
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2672
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2673
 msgid "Bank"
 msgstr "Bank"
@@ -20107,14 +20410,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2675
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2677 build/trans_presets.java:2686
+#: build/trans_presets.java:2680 build/trans_presets.java:2689
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2682
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -20122,5 +20425,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2684
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -20128,15 +20431,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2691
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2696
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2697
 msgid "Doctors"
 msgstr "Läkare"
@@ -20144,18 +20447,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2699
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2704
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2705
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2710
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -20163,5 +20466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2712
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -20169,9 +20472,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2714
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2718
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -20179,10 +20482,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2720
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2724
 msgid "Emergency Access Point"
 msgstr ""
@@ -20191,5 +20494,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2727
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20198,20 +20501,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2730
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2731
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2733
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2734
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -20219,5 +20522,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2737
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -20226,55 +20529,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2740
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
 #. group "Places"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2748
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2749
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2754
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2755
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2760
 msgid "State"
 msgstr "Delstat"
 
 #. item
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2761
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2766
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2767
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2772
 msgid "County"
 msgstr "Län"
 
 #. item
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2773
 msgid "Edit County"
 msgstr "Redigera län"
@@ -20282,15 +20585,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2779
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2780
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2785
 msgid "Town"
 msgstr "Småstad"
@@ -20298,10 +20601,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2787
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2792
 msgid "Suburb"
 msgstr "Förort"
@@ -20309,25 +20612,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2794
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2799
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2800
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2805
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2806
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -20335,5 +20638,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2812
 msgid "Locality"
 msgstr "Plats"
@@ -20341,10 +20644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2814
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2819
 msgid "Island"
 msgstr "Ö"
@@ -20352,24 +20655,22 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2821
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2823
-#, fuzzy
+#: build/trans_presets.java:2826
 msgid "Islet"
-msgstr "vänster"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2825
-#, fuzzy
+#: build/trans_presets.java:2828
 msgid "Edit Islet"
-msgstr "Redigera fäbod"
+msgstr ""
 
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2834
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -20377,10 +20678,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2836
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2840
 msgid "Peak"
 msgstr "Topp"
@@ -20388,10 +20689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2842
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2847
 msgid "Glacier"
 msgstr "Glaciär"
@@ -20399,10 +20700,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2849
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2854
 msgid "Volcano"
 msgstr "Vulkan"
@@ -20410,70 +20711,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2856
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2862
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2863
 msgid "National"
 msgstr "Nationella"
 
 #. item
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2864
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2869
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2870
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2875
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2876
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2881
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2882
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2887
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2888
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2894
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2895
 msgid "Tree"
 msgstr "Träd"
@@ -20482,15 +20783,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2898
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2903
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2905
 msgid "Wood"
 msgstr "Naturskog"
@@ -20499,5 +20800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2908
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -20505,17 +20806,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2913
 msgid "Forest"
 msgstr "Kulturskog"
@@ -20524,14 +20825,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2916
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2922
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2923
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -20539,25 +20840,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2928
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2929
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2933
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2934
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2938
 msgid "Fell"
 msgstr "Höglandshed"
@@ -20565,10 +20866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2940
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2944
 msgid "Heath"
 msgstr "Hed"
@@ -20576,5 +20877,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2946
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -20582,5 +20883,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2951
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -20589,45 +20890,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2954
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2959
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2960
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2965
 msgid "Meadow"
 msgstr "Äng"
 
 #. item
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2966
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2971
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2972
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2977
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2978
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -20635,25 +20936,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2984
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2985
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2989
 msgid "Grass"
 msgstr "Gräs"
 
 #. item
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2990
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2995
 msgid "Village Green"
 msgstr "Allmänning"
@@ -20661,10 +20962,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:2997
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3002
 msgid "Common"
 msgstr "Allmänning"
@@ -20672,20 +20973,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3004
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3008
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3009
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3013
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -20693,5 +20994,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3015
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -20699,15 +21000,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3021
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3022
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3027
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -20715,9 +21016,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3029
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3035
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -20725,39 +21026,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3037
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3044
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3045
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3050
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3051
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3056
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3057
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3062
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -20765,15 +21066,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3064
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3069
 msgid "Military"
 msgstr "Militärt område"
 
 #. item
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3070
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -20781,55 +21082,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3076
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3077
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3082
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3083
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3088
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3089
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3094
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3095
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3100
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3101
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
 #. group "Relations"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3110
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20839,5 +21140,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3114
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -20846,10 +21147,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3120
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3121
 msgid "inner segment"
 msgstr "inre segment"
@@ -20857,5 +21158,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3124
 msgid "Turn restriction"
 msgstr ""
@@ -20864,5 +21165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3127
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20870,34 +21171,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -20906,15 +21207,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3134
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3135
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3136
 msgid "to way"
 msgstr "till sträcka"
@@ -20922,5 +21223,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3139
 msgid "Route"
 msgstr ""
@@ -20929,5 +21230,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3142
 msgid "Edit Route"
 msgstr ""
@@ -20935,5 +21236,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "Route type"
 msgstr ""
@@ -20941,5 +21242,5 @@
 #. item "Relations/Route" combo "Route type"
 #. color destination
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -21005,5 +21306,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3141 build/trans_style.java:233
+#: build/trans_presets.java:3144 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21012,17 +21313,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ski"
 msgstr ""
@@ -21075,5 +21376,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3141 build/trans_style.java:247
+#: build/trans_presets.java:3144 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21082,13 +21383,13 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "detour"
 msgstr ""
@@ -21102,10 +21403,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3141 build/trans_style.java:1206
+#: build/trans_presets.java:3144 build/trans_style.java:1206
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3147
 msgid "Symbol description"
 msgstr ""
@@ -21113,31 +21414,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3150
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3153
 msgid "Color (hex)"
 msgstr ""
@@ -21146,30 +21447,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3156
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3157
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3158
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3159
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3160
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3161
 msgid "backward halt point"
 msgstr ""
@@ -24322,76 +24623,4 @@
 msgstr "historisk"
 
-#. color historic
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--landuse tags -->
-#.
-#. <rule>
-#. <condition k="landuse" v="farm"/>
-#. color green
-#. <icon annotate="true" src="misc/landmark/farm.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="farmland"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="meadow"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="vineyard"/>
-#. color forest
-#. <icon src="misc/landmark/trees.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="allotments"/>
-#. color green
-#. <icon src="misc/landmark/plant.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="grass"/>
-#. color cemetery
-#. <icon src="rendering/landuse/cemetery.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="village_green"/>
-#. color green
-#. <icon src="leisure/common.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3055 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3127 build/trans_style.java:3135
-#: build/trans_style.java:3233 build/trans_style.java:3241
-msgid "green"
-msgstr ""
-
 #. color green
 #. <icon annotate="true" src="shop/groceries/fruits.png"/>
@@ -25359,164 +25588,143 @@
 msgstr ""
 
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#. only for Czech Republic
+#: build/trans_wms.java:25
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:26
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alla sträckor var tomma"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Slå ihop noder med olika medlemskap?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Slå ihop i alla fall"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
+#~ "dem?"
+
+#~ msgid "Unknown version"
+#~ msgstr "Okänd version"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har nollreferens"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fann <member>-tagg utanför relation."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Felformaterad nod-id"
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Avbryter..."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr ""
+#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
+
+#~ msgid "Change"
+#~ msgstr "Ändra"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Jämka {0} konflikter i {1} objekt"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Ta bort {1} {0}"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "olik"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sann"
+
+#~ msgid "their version:"
+#~ msgstr "deras version:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objekt har konflikter:"
+#~ msgstr[1] "{0} objekt har konflikter:"
+
+#~ msgid "my version:"
+#~ msgstr "min version:"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Taggar (tomt värde tar bort taggen)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Innehas av"
+
+#~ msgid "Add Selected"
+#~ msgstr "Lägg till vald"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan inte ansluta till server."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Fel vid inläsning av serverns svar."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Konflikter upptäcktes under import."
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Ansluter till OSM-servern"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Användarnamn (epost) för OSM-kontot"
+
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
 #~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
 #~ "servern."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. "
-#~ "Rapportera in detta som ett fel."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr ""
-#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Ta bort {1} {0}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Radera relationsmedlem {0} {1}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan inte öppna inställningsmappen: {0}"
-
-#~ msgid "nodes"
-#~ msgstr "noder"
-
-#~ msgid "ways"
-#~ msgstr "vägar"
-
-#~ msgid "relations"
-#~ msgstr "relationer"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Ta bort lager"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Upphovsmän: {0}"
-
-#~ msgid "Public"
-#~ msgstr "Publik"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du "
-#~ "skickar in det."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsätt ändå"
-
-#~ msgid "map"
-#~ msgstr "karta"
-
-#~ msgid "citymap"
-#~ msgstr "stadskarta"
-
-#~ msgid "hikingmap"
-#~ msgstr "vandringskarta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cykelkarta"
-
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
-
-#~ msgid "Change"
-#~ msgstr "Ändra"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Jämka {0} konflikter i {1} objekt"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "their version:"
-#~ msgstr "deras version:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekt har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "jämkad version:"
-
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Innehas av"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lägg till vald"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan inte ansluta till server."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fel vid inläsning av serverns svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Konflikter upptäcktes under import."
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Ansluter till OSM-servern"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Användarnamn (epost) för OSM-kontot"
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -25560,14 +25768,4 @@
 #~ msgstr "Navigation"
 
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger "
-#~ "musknapp och flytta musen. Välj: Klicka"
-
-#~ msgid "end"
-#~ msgstr "slut"
-
 #~ msgid "Commit comment"
 #~ msgstr "Bidragskommentar"
@@ -25598,4 +25796,7 @@
 #~ msgstr "Insticksmodulen finns redan"
 
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr ""
@@ -25622,4 +25823,16 @@
 #~ msgid "Drawbridge"
 #~ msgstr "Klaffbro"
+
+#~ msgid "hikingmap"
+#~ msgstr "vandringskarta"
+
+#~ msgid "citymap"
+#~ msgstr "stadskarta"
+
+#~ msgid "map"
+#~ msgstr "karta"
+
+#~ msgid "bicyclemap"
+#~ msgstr "cykelkarta"
 
 #~ msgid ""
@@ -25728,4 +25941,10 @@
 #~ "{0}"
 
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Kan inte öppna inställningsmappen: {0}"
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Upphovsmän: {0}"
+
 #~ msgid "Layers: {0}"
 #~ msgstr "Lager: {0}"
@@ -25762,9 +25981,33 @@
 #~ msgstr "Ta bort det valda"
 
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
+
+#~ msgid "Public"
+#~ msgstr "Publik"
+
 #~ msgid "Server does not support changesets"
 #~ msgstr "Servern har inte stöd för ändringssamlingar"
 
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. "
+#~ "Rapportera in detta som ett fel."
+
+#~ msgid "Delete Layer"
+#~ msgstr "Ta bort lager"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Ta bort och hämta hem"
+
+#~ msgid "Continue anyway"
+#~ msgstr "Fortsätt ändå"
+
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr ""
+#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du "
+#~ "skickar in det."
 
 #~ msgid "sports"
@@ -25897,4 +26140,13 @@
 #~ msgstr "Uppdatering misslyckades"
 
+#~ msgid "nodes"
+#~ msgstr "noder"
+
+#~ msgid "relations"
+#~ msgstr "relationer"
+
+#~ msgid "ways"
+#~ msgstr "vägar"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
@@ -25905,2 +26157,5 @@
 #~ msgid "No data"
 #~ msgstr "Inga data"
+
+#~ msgid "Remove relation member {0} {1}"
+#~ msgstr "Radera relationsmedlem {0} {1}"
