Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 16493)
+++ applications/editors/josm/i18n/po/sv.po	(revision 16827)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 18:01+0200\n"
-"PO-Revision-Date: 2009-07-12 17:35+0000\n"
-"Last-Translator: David S <Unknown>\n"
+"POT-Creation-Date: 2009-08-04 11:43+0200\n"
+"PO-Revision-Date: 2009-07-27 07:18+0000\n"
+"Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,82 +16,162 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n"
+"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
+#, java-format
+msgid ""
+"Failed to access system property ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:196
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:281
+#: ../core/src/org/openstreetmap/josm/Main.java:289
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:394
+#: ../core/src/org/openstreetmap/josm/Main.java:290
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
+#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+msgid "Error"
+msgstr "Fel"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:399
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/Main.java:400
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:396
+#: ../core/src/org/openstreetmap/josm/Main.java:401
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
+#: ../core/src/org/openstreetmap/josm/Main.java:402
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
+#: ../core/src/org/openstreetmap/josm/Main.java:402
 msgid "Discard and Exit"
 msgstr "Kassera och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
+#: ../core/src/org/openstreetmap/josm/Main.java:402
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -100,32 +180,92 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:424
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:437
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:450
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+msgid "Warning"
+msgstr "Varning"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:449
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
 msgid "UNKNOWN"
 msgstr "OKÄND"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "Display the about screen."
 msgstr "Visa om-skärmen"
@@ -133,10 +273,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -144,5 +284,5 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
@@ -151,19 +291,19 @@
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Last change at {0}"
 msgstr "Senast ändrad {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 #, java-format
 msgid "Java Version {0}"
 msgstr "Javaversion {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
 msgid "Bug Reports"
 msgstr "Buggrapporter"
@@ -173,37 +313,41 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27
 #: build/trans_surveyor.java:64
 msgid "Info"
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Readme"
 msgstr "Läsmig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
 msgid "Revision"
 msgstr "Utgåva"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+msgid "License"
+msgstr "Licens"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
 msgid "About JOSM..."
 msgstr "Om JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
 msgid "File could not be found."
 msgstr "Filen kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
 #, java-format
 msgid ""
@@ -214,16 +358,9 @@
 "OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-msgid "Warning"
-msgstr "Varning"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74
 #, java-format
 msgid ""
@@ -231,8 +368,38 @@
 "primitives only"
 msgstr ""
+"VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade "
+"primitiven."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
+#, fuzzy
+msgid "Please select the target layer."
+msgstr "Välj vilken rad du vill ta bort."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#, fuzzy
+msgid "Select target layer"
+msgstr "Välj antingen:"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
+#, fuzzy
+msgid "Merge"
+msgstr "Slå ihop noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
+#, java-format
+msgid ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
+msgid "No target layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
 msgid "Add Node..."
 msgstr "Lägg till nod..."
@@ -244,14 +411,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #, java-format
@@ -259,57 +428,57 @@
 msgstr "Redigera: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
 msgid "Enter the coordinates for the new node."
 msgstr "Ange den nya nodens koordinater."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
 msgid "Use decimal degrees."
 msgstr "Använd decimalgrader."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negativa värden avser västra/södra halvklotet."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
 msgid "Latitude"
 msgstr "Latitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
 msgid "Longitude"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
 msgid "Align Nodes in Circle"
 msgstr "Bilda en cirkel av noderna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 msgid "Move the selected nodes into a circle."
 msgstr "Flytta de valda noderna in i en cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -325,25 +494,58 @@
 msgstr "Verktyg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
 msgid "Please select at least four nodes."
 msgstr "Välj åtminstone fyra noder."
 
+#. FIXME: not sure whether this fits in a dialog
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Information"
+msgstr "Information"
+
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132
 msgid "Align Nodes in Line"
 msgstr "Placera noderna i en rak linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Flytta de valda noderna in i en linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
 msgid "Please select at least three nodes."
 msgstr "Välj åtminstone tre noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53
 #, java-format
 msgid ""
@@ -354,18 +556,10 @@
 "är {0}, max är {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109
 msgid "API Capabilities Violation"
 msgstr "Bryter mot API:ns möjligheter"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
-msgid "Failed to initialize API. Please try again later."
-msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-msgid "API initialization failed"
-msgstr "Misslyckades att initialisera API."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78
 #, java-format
 msgid ""
@@ -376,5 +570,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87
 #, java-format
 msgid ""
@@ -385,46 +579,47 @@
 "tillåtna längden ({2}). Värdets längd är {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90
 msgid "Precondition Violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "layer"
 msgstr "lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "selection"
 msgstr "urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "download"
 msgstr "nedhämtad data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zooma till {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zooma det visade till  {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -434,30 +629,30 @@
 msgstr "Visa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 msgid "Nothing selected to zoom to."
 msgstr "Det finns inte något valt att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 msgid "No conflicts to zoom to"
 msgstr "Det finns inte några konflikter att zooma till"
 
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Slå ihop sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Förena flera sträckor till en enda."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
 msgid "Combine ways with different memberships?"
 msgstr "Slå ihop sträckor med olika roller?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -466,13 +661,13 @@
 "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid "Combine Anyway"
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
 msgid "Change directions?"
 msgstr "Ändra riktning?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -482,10 +677,10 @@
 "några av dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid "Reverse and Combine"
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -493,20 +688,20 @@
 msgstr "Ange värden för alla konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Jämka konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
 msgid "All the ways were empty"
 msgstr "Alla sträckor var tomma"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -525,111 +720,149 @@
 msgstr "Kopiera valda objekt till inklistringsbuffern."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 msgid "Please select something to copy."
 msgstr "Välj någonting att kopiera."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
 msgid "Create Circle"
 msgstr "Skapa cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
 msgstr "Skapa en cirkel av tre valda noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
-msgid "Those nodes are not in a circle."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#, fuzzy
+msgid "Those nodes are not in a circle. Aborting."
 msgstr "De noderna är inte i en cirkel."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275
+"Välj antingen precis två eller tre noder, eller en sträcka som innehåller "
+"precis två eller tre noder."
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
 msgid "Delete selected objects."
 msgstr "Ta bort valda objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
 msgid "File exists. Overwrite?"
 msgstr "Filen existerar redan. Vill du skriva över?"
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133
 msgid "Distribute Nodes"
 msgstr "Distribuera noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Distribuera de valda noderna på jämna avstånd längs en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Hämta från OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Hämta kartdata från OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 #, java-format
 msgid "File: {0}"
 msgstr "Arkiv: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45
 msgid "Download"
 msgstr "Hämta"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 msgid "Please select at least one task to download"
 msgstr "Välj åtminstone en uppgift att hämta"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+msgid "Download referrers from OSM..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+msgid "Download primitives referring to one of the selected primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
+msgid "Download referrers..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "{0} konflikter uppstod under import."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
+#, fuzzy
+msgid "Conflicts during download"
+msgstr "Fel under nedladdning"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
+#, java-format
+msgid "({0}/{1}) Loading parents of primitive {2}"
+msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in."
@@ -649,5 +882,5 @@
 msgstr "Avsluta programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -657,58 +890,73 @@
 "licens."
 
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportera till GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportera data till en GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
 msgid "Nothing to export. Get some data first."
 msgstr "Det finns inte något att exportera. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#, java-format
+msgid "paramenter ''{0}'' must not be null"
+msgstr "parametern ''{0}'' får inte vara null"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#, java-format
+msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
 msgid "gps track description"
 msgstr "beskrivning av gps-spår"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 msgid "Add author information"
 msgstr "Lägg till information om upphovsman"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
 msgid "Real name"
 msgstr "Namn"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
 msgid "Predefined"
 msgstr "Fördefinierad"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
 msgid "Copyright year"
 msgstr "Copyrightår"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
 msgid "Export options"
 msgstr "Exportalternativ"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
 msgid "Export and Save"
 msgstr "Exportera och spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
 #, java-format
 msgid ""
@@ -719,25 +967,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
-msgid "Error"
-msgstr "Fel"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
 msgid "Choose a predefined license"
 msgstr "Välj en fördefinierad licens"
@@ -747,46 +975,49 @@
 msgstr "Onlinehjälp för JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
 msgid "Open in Browser"
 msgstr "Öppna i webbläsare"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
 msgstr "Uppdatera"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Fel vid inläsning av sida{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224
 #, java-format
 msgid ""
@@ -804,14 +1035,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr ""
+msgstr "Visa historik om OSM vägar, noder eller relationer."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
 msgid "Info about Element"
-msgstr ""
+msgstr "Information om element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
+msgstr "Visa objektinformation om OSM noder, vägar eller relationer."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -824,30 +1055,40 @@
 msgstr "Anslut en nod till det närmaste avsnittet av en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
 msgid "Join Node and Line"
 msgstr "Förena nod och linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Inget kortkommando"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#, fuzzy
+msgid "Merge layer"
+msgstr "Slå ihop i alla fall"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#, fuzzy
+msgid "Merge the current layer into another layer"
+msgstr "Slå ihop det lager som finns precis under med det valda lagret."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Slå ihop noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Merge nodes into the oldest one."
 msgstr "Slå ihop noder med den äldsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
 msgid "Please select at least two nodes to merge."
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
 msgid "Merge nodes with different memberships?"
 msgstr "Slå ihop noder med olika medlemskap?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -856,9 +1097,9 @@
 "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 msgid "Merge Anyway"
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -866,60 +1107,71 @@
 "behöva tas bort."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Slå ihop {0} noder"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#, fuzzy
+msgid "Merge selection"
+msgstr "urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#, fuzzy
+msgid "Merge the currently selected primitives into another layer"
+msgstr "Uppdatera markerade primitiv från servern"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76
 msgid "Mirror"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+msgstr "Spegel"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Spegla markerade noder och sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
 msgid "Please select at least one node or way."
 msgstr "Markera minst en nod eller sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "upp"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Flytta objekt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vänster"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "höger"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Flytta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Flytta objekt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
 msgid "Cannot move objects outside of the world."
 msgstr "Kan inte flytta objekt utanför världen."
@@ -927,5 +1179,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "New"
 msgstr "Ny"
@@ -935,26 +1187,17 @@
 msgstr "Skapa ny karta"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22
-msgid "unnamed"
-msgstr "namnlös"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
 msgid "Open a file."
 msgstr "Öppna en fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Kunde inte öppna \"{0}\""
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59
+#, java-format
+msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -983,34 +1226,35 @@
 msgstr "Hämta URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
 msgid "Orthogonalize Shape"
 msgstr "Räta upp form"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62
 msgid "Only two nodes allowed"
 msgstr "Enbart två noder kan vara valda"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
 msgid "Selection must consist only of ways."
 msgstr "Urvalet måste bestå uteslutande av sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87
 msgid "Please select one or more closed ways of at least four nodes."
 msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109
 msgid "Please select ways with almost right angles to orthogonalize."
 msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
+#, fuzzy
 msgid ""
 "<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?"
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
 "<html>Du använder dig av projektionen EPSG:4326 vilket kan leda "
@@ -1019,9 +1263,9 @@
 "du fortsätta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
 msgid "Only one node selected"
 msgstr "Enbart en nod vald"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283
 msgid "Orthogonalize"
 msgstr "Räta upp"
@@ -1037,11 +1281,11 @@
 msgstr "Klistra in innehållet i inklistringsbuffern"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
 msgid "Paste Tags"
 msgstr "Klistra in taggar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1071,16 +1315,21 @@
 msgstr "Gör om den senaste ogjorda handlingen."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Byt namn på lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Byt också namn på filen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
-#, java-format
-msgid "Could not rename the file \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70
+#, java-format
+msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
+#, fuzzy, java-format
+msgid "Could not rename file ''{0}''"
 msgstr "Kunde inte byta namn på filen \"{0}\"."
 
@@ -1094,9 +1343,9 @@
 msgstr "Ändra riktningen på alla valda sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 msgid "Please select at least one way."
 msgstr "Välj åtminstone en sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80
 msgid "Reverse ways"
 msgstr "Ändra riktning på sträckor"
@@ -1104,17 +1353,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183
 msgid "Save"
 msgstr "Spara"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182
 msgid "Save the current data."
 msgstr "Spara nuvarande data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
 #, java-format
 msgid "File {0} exists. Overwrite?"
 msgstr "Fil {0} existerar redan. Skriv över?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1124,26 +1375,26 @@
 "in detta som ett fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "No document open so nothing to save."
 msgstr ""
 "Det finns inte något öppet dokument, så det finns inte något att spara."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "The document contains no data."
 msgstr "Dokumentet innehåller inte någon data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "Save anyway"
 msgstr "Spara i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1153,54 +1404,75 @@
 "som om du avvisat dem alla. Fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
 msgid "Reject Conflicts and Save"
 msgstr "Avvisa konflikter och spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Save OSM file"
 msgstr "Spara OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
 msgid "Save GPX file"
 msgstr "Spara GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save Layer"
 msgstr "Spara Lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
-msgid "Could not back up file."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#, fuzzy, java-format
+msgid "Could not back up file. Exception is: {0}"
 msgstr "Kunde inte backa upp filen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#, fuzzy, java-format
+msgid "Unknown file extension for file ''{0}''"
+msgstr "Okänt filformat: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
+#, fuzzy, java-format
+msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
+msgstr "Det uppstod ett fel när filen skulle sparas."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
+#, fuzzy, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
+"html>"
+msgstr "Det uppstod ett fel när backup-filen skulle återställas."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
 msgid "Unknown file extension."
 msgstr "Okänd filändelse."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-msgid "An error occurred while saving."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
+#, fuzzy, java-format
+msgid "An error occurred while saving. Error is: {0}"
 msgstr "Det uppstod ett fel när filen skulle sparas."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
-msgid "An error occurred while restoring backup file."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
+#, fuzzy, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
 msgstr "Det uppstod ett fel när backup-filen skulle återställas."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198
 msgid "Save the current data to a new file."
 msgstr "Spara nuvarande data i en ny fil."
 
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Välj allt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1234,16 +1506,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Close"
 msgstr "Stäng"
 
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Dela sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Dela sträckan vid vald nod."
@@ -1253,5 +1525,5 @@
 msgstr "Det går inte att dela baserat på nuvarande urval."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1259,5 +1531,5 @@
 msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1273,9 +1545,9 @@
 "sträckan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected nodes do not share the same way."
 msgstr "De valda noderna ingår inte i samma sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1283,10 +1555,10 @@
 msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1296,19 +1568,23 @@
 "sträckan.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#, fuzzy
 msgid ""
-"A role based relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
 msgstr ""
 "Ett rollbaserat relationsmedlemskap kopierades till alla nya sträckor.\n"
 "Du bör kontrollera detta och rätta till eventuella fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#, fuzzy
 msgid ""
-"A relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"Medlemskap i relationer kopierades till alla nya vägar.\n"
+"Du bör verifiera att detta är korrekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1329,47 +1605,47 @@
 msgstr "Byter läge för den globala inställningen ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Frigör sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicera noder som används av flera olika sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83
 msgid "This node is not glued to anything else."
 msgstr "Denna nod är inte bunden till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av dessa noder hänger ihop med någonting annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "The current selection cannot be used for unglueing."
 msgstr "Det nuvarande urvalet kan inte användas för att frigöra något."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid "Select either:"
 msgstr "Välj antingen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "* One tagged node, or"
 msgstr "* En nod med tagg, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One node that is used by more than one way, or"
 msgstr "* En nod som används av mer än en sträcka, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1378,5 +1654,5 @@
 "eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1385,5 +1661,5 @@
 "sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1398,9 +1674,9 @@
 "få sina egna kopior och alla noder kommer att vara valda."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171
 msgid "Unglued Node"
 msgstr "Frigjord nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1408,5 +1684,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1422,141 +1698,91 @@
 msgstr "Ångra senaste åtgärden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
 msgid "Unselect All"
 msgstr "Avmarkera alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect all objects."
 msgstr "Avmarkera alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 msgid "Unselect All (Focus)"
 msgstr "Avmarkera allt (fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
 msgid "Unselect All (Escape)"
 msgstr "Avmarkera allt (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Update Data"
 msgstr "Uppdatera data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
 msgid "Updates the current data layer from the server (re-downloads data)"
 msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64
-msgid ""
-"No data to update found. Have you already opened or downloaded a data layer?"
-msgstr ""
-"Ingen data som behövde uppdateras hittades. Har du redan öppnat eller laddat "
-"ner ett datalager?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65
-msgid "No data"
-msgstr "Inga data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61
-msgid "Failed to update the selected primitives."
-msgstr "Misslyckades med att uppdatera markerade primitiv."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62
-msgid "Update failed"
-msgstr "Uppdatering misslyckades"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76
-#, java-format
-msgid "Could not find primitive with id {0} in the current dataset"
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+#, fuzzy
+msgid "No current dataset found"
+msgstr "Inget GPX-datalager kunde hittas."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+#, fuzzy
+msgid "Didn't find a primitive with id {0} in the current dataset"
 msgstr "Kunde inte hitta primitiv med id {0} i nuvarande dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "Missing primitive"
-msgstr "Primitiv saknas"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid "Update Selection"
 msgstr "Uppdatera markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Updates the currently selected primitives from the server"
 msgstr "Uppdatera markerade primitiv från servern"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "There are no selected primitives to update."
 msgstr "Det finns inga markerade primitiv att uppdatera."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
 msgid "Selection empty"
 msgstr "Tom markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 msgid "Upload to OSM..."
 msgstr "Skicka in till OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Upload all changes to the OSM server."
 msgstr "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
-msgid "Objects to add:"
-msgstr "Nya objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
-msgid "Objects to modify:"
-msgstr "Ändrade objekt:"
-
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-msgid "Objects to delete:"
-msgstr "Borttagna objekt:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
-msgid "Upload these changes?"
-msgstr "Skicka in dessa ändringar?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
-msgid "Upload Changes"
-msgstr "Skicka in ändringar"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Det finns olösta konflikter. Du måste lösa dessa först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
-msgid "Uploading"
-msgstr "Ladda Upp"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
-msgid "Updating primitive"
-msgstr "Uppdaterar primitiv"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisera enbart {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
 msgid "Synchronize entire dataset"
 msgstr "Synkronisera hela datasetet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215
 #, java-format
 msgid ""
@@ -1570,17 +1796,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 msgid "Conflict detected"
 msgstr "Konflikt upptäkt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "oförväntat returvärde. Erhöll {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258
 #, java-format
 msgid ""
@@ -1596,5 +1822,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1602,58 +1828,60 @@
 "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
-#, java-format
-msgid ""
-"<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/actions/UploadAction.java:426
-msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
-#, 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/actions/UploadAction.java:470
-msgid "Primitive already deleted"
-msgstr "Primitiv redan raderad"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380
 #, java-format
 msgid "<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:545
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389
 msgid "Upload to OSM API failed"
 msgstr "Uppladningen till OSM API misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575
-#, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
+msgid "Updating primitive"
+msgstr "Uppdaterar primitiv"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#, fuzzy
+msgid "upload all changes in one request"
+msgstr "Skicka in alla ändringar till OSM-servern."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
 msgid ""
-"Failed to initialize communication with the OSM server {0}.\n"
-"Check the server URL in your preferences and your internet connection."
-msgstr ""
-"Kunde inte upprätta anslutning till OSM servern {0}.\n"
-"Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
-"inställningar."
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
+msgid "Objects to add:"
+msgstr "Nya objekt:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472
+msgid "Objects to modify:"
+msgstr "Ändrade objekt:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480
+msgid "Objects to delete:"
+msgstr "Borttagna objekt:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499
+msgid "Upload these changes?"
+msgstr "Skicka in dessa ändringar?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501
+msgid "Upload Changes"
+msgstr "Skicka in ändringar"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531
+msgid "Uploading"
+msgstr "Ladda Upp"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1741,42 +1969,54 @@
 msgstr "Långsammare framåt"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
 msgid "Downloading GPS data"
 msgstr "Hämtar GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
 msgid "Downloaded GPX Data"
 msgstr "Hämtade GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
 msgid "Raw GPS data"
 msgstr "Rå GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
 msgid "Downloading data"
 msgstr "Hämtar data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
 msgid "No data imported."
 msgstr "Ingen data importerad."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Laddar ner {0} av {1} ({2} kvar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93
-msgid "The following errors occurred during mass download:"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
+#, fuzzy
+msgid "Updating data"
+msgstr "Skickar data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download:{0}"
 msgstr "Följande fel inträffade under massnedladdning:"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
 msgid "Errors during Download"
 msgstr "Fel under nedladdning"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 #, java-format
 msgid ""
@@ -1793,21 +2033,21 @@
 "<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
 msgid "Deleted or moved primitives"
 msgstr "Raderade eller flyttade primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 msgid "Delete Mode"
 msgstr "Borttagningsläge"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49
 msgid "Delete nodes or ways."
 msgstr "Ta bort noder eller sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 #, java-format
@@ -1815,5 +2055,5 @@
 msgstr "Läge: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1823,762 +2063,23 @@
 "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Draw"
-msgstr "Rita"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-msgid "Draw nodes"
-msgstr "Rita noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Mode: Draw Focus"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
-msgid "selected"
-msgstr "markerad"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
-msgid "Cannot add a node outside of the world."
-msgstr "Det går inte att lägga till en nod utanför världen."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
-msgid "Add node"
-msgstr "Lägg till nod"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
-msgid "Add node into way"
-msgstr "Lägg till en nod till sträckan"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
-msgid "Connect existing way to node"
-msgstr "Knyt en existerande nod till en sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Add a new node to an existing way"
-msgstr "Lägg till en ny nod i en befintlig sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
-msgid "Add node into way and connect"
-msgstr "Lägg till en nod i en sträcka och bind ihop"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
-msgid "Create new node."
-msgstr "Skapa ny nod"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
-msgid "Select node under cursor."
-msgstr "Markera nod under pekare."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Infoga ny nod i väg."
-msgstr[1] "Infoga ny nod i {0} vägar."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
-msgid "Start new way from last node."
-msgstr "Starta ny väg från senaste nod."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Continue way from last node."
-msgstr "Fortsätt väg från senaste nod."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
-msgid "Finish drawing."
-msgstr "Avsluta ritning."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-msgid "Extrude"
-msgstr "Dra ut"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-msgid "Create areas"
-msgstr "Skapa ytor"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
-msgid "Extrude Way"
-msgstr "Dra ut sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Släpp musknappen för att välja objekten i rektangeln."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
-msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
-msgid "Release the mouse button to stop rotating."
-msgstr "Släpp musknappen för att sluta rotera."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
-msgid "Drag a way segment to make a rectangle."
-msgstr "Dra en delsträcka för bilda en rektangel."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud "
-"därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
-msgid "Select"
-msgstr "Markera"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
-msgid "Select, move and rotate objects"
-msgstr "Välj, flytta och rotera objekt."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
-#, java-format
-msgid "Add and move a virtual new node to way"
-msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Lägg till och flytta en virtuell ny nod till väg."
-msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
-msgid "Move elements"
-msgstr "Flytta element"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
-#, java-format
-msgid ""
-"You did move more than {0} elements. Moving a large number of elements is "
-"often an error.\n"
-"Really move them?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Släpp musknappen för att sluta flytta. Ctrl för att slå ihop med närmaste "
-"nod."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-"Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för att "
-"växla läge); Skift+Ctrl för att rotera"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
-msgid "Zoom"
-msgstr "Zooma:"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-msgid "Zoom and move map"
-msgstr "Zooma och flytta kartan"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"Zooma genom att dra eller Ctrl+. eller Ctrl+,; flytta med Ctrl+upp, vänster, "
-"ned, höger; flytta karta med högerknappen"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
-msgid "Search..."
-msgstr "Sök..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-msgid "Search for objects."
-msgstr "Sök efter objekt."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
-msgid "No data loaded."
-msgstr "Ingen data har lästs in."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57
-msgid "Please enter a search string."
-msgstr "Ange en söksträng."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
-msgid "replace selection"
-msgstr "ersätt urval"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
-msgid "add to selection"
-msgstr "utöka urval"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63
-msgid "remove from selection"
-msgstr "ta bort från urval"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "case sensitive"
-msgstr "gör skillnad på gemener/VERSALER"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
-msgid "regular expression"
-msgstr "reguljärt uttryck"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
-msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr ""
-"<b>Baker Street</b> - 'Baker' och 'Street' i vilken nyckel eller vilket "
-"värde som helst."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr ""
-"<b>\"Baker Street\"</b> - 'Baker Street' i vilken nyckel eller vilket värde "
-"som helst."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Bak</b> - 'Bak' var som helst i nyckeln name."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
-msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Bak</b> - som inte har 'Bak'  i nyckeln name."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
-msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - som innehåller nyckeln foot oavsett dess värde."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
-msgid "<u>Special targets:</u>"
-msgstr "<u>Särskilda mål:</u>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - elementets typ (<b>node</b> för nod, <b>way</b> för sträcka, "
-"<b>relation</b> för relation)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - alla objekt som ändrats av användare..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
-msgid "<b>id:</b>... - object with given ID"
-msgstr "<b>id:</b>... - objektet med angiven ID"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
-msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - objekt med givent antal noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alla ändrade objekt"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alla valda objekt"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - alla ofullständiga objekt"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>otaggade</b> - alla otaggede objekt"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr ""
-"Use <b>\"</b> för att sätta operatorer inom citattecken (t ex om nyckeln "
-"innehåller :)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-msgid "Search"
-msgstr "Sök"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-msgid "Start Search"
-msgstr "Påbörja sökning"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-#, java-format
-msgid "No match found for ''{0}''"
-msgstr "Inga sökträffar för ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-#, java-format
-msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
-#, java-format
-msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Urvalet begränsades inte genom att söka efter ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
-#, java-format
-msgid "Found {0} matches"
-msgstr "{0} sökträffar"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
-msgid "CS"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
-msgid "CI"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
-msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
-#, java-format
-msgid ""
-"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
-"\n"
-"{2}"
-msgstr ""
-"Det reguljära uttrycket \"{0}\" orsakade tolkningsfel vid offset {1}, "
-"fullständigt fel:\n"
-"\n"
-"{2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172
-msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359
-#, java-format
-msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
-#, java-format
-msgid "Unexpected token: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
-msgid "Missing arguments for or."
-msgstr "Det saknas argument för eller (or)."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529
-msgid "Missing argument for not."
-msgstr "Det saknas argument för inte (not)."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
-msgid "Expected closing parenthesis."
-msgstr "En avslutande parentes förväntades"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596
-msgid "Wrong number of parameters for nodes operator."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
-#, java-format
-msgid ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606
-#, java-format
-msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
-msgid "Load Selection"
-msgstr "Hämta urval"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41
-#, java-format
-msgid "Contact {0}..."
-msgstr "Kontakta {0}..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
-msgid "Downloading..."
-msgstr "Hämtar..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "Kunde inte läsa från URL:en: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "Inläsningsfel på URL:en: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
-msgid "Error while communicating with server."
-msgstr "Fel under kommunikation med servern."
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
-#, java-format
-msgid "Add {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
-#, java-format
-msgid "Change {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
-#, java-format
-msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Ta bort \"{0}\" för {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
-#, java-format
-msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Sätt {0}={1} för {2} ''{3}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "objekt"
-msgstr[1] "objekt"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Ta bort \"{0}\" för {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
-msgstr "Sätt {0}={1} för {2} {3}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
-#, java-format
-msgid "Change relation member role for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
-msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Ta bort {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Ta bort {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-msgid "Conflicting relation"
-msgstr "Relationskonflikt"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n"
-"Ta bort från relationen?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
-msgid "Delete from relation"
-msgstr "Ta bort från relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
-"Ta bort från relationen?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
-msgid "Split way segment"
-msgstr "Dela delsträcka"
-
-#. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-"Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
-"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
-"använder dem.<br> Vill du verkligen ta bort dem?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Flytta"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "nod"
-msgstr[1] "noder"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Lös {0} taggninskonfliker i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Ångra radering av {0} primitiv"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Lös versionskonfliker för {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Lös konflikter i nodlistan för väg {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Tillämpa?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
-"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Gammal roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Ny roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Gammal nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Gammalt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nytt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Verkställ valda ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Verkställ inte ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Egenskaper för "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatisk taggrättning"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Fel i konfigurationsfilen på raderna {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan inte öppna inställningsmappen: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Inställningar lagrade på {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kunde inte hämta inställningar från server."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
@@ -2590,7 +2091,804 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342
 #, java-format
 msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100
+msgid "Draw"
+msgstr "Rita"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+msgid "Draw nodes"
+msgstr "Rita noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100
+msgid "Mode: Draw Focus"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+msgid "selected"
+msgstr "markerad"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+msgid "Cannot add a node outside of the world."
+msgstr "Det går inte att lägga till en nod utanför världen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+msgid "Add node"
+msgstr "Lägg till nod"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+msgid "Add node into way"
+msgstr "Lägg till en nod till sträckan"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+msgid "Connect existing way to node"
+msgstr "Knyt en existerande nod till en sträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+msgid "Add a new node to an existing way"
+msgstr "Lägg till en ny nod i en befintlig sträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+msgid "Add node into way and connect"
+msgstr "Lägg till en nod i en sträcka och bind ihop"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+msgid "Create new node."
+msgstr "Skapa ny nod"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+msgid "Select node under cursor."
+msgstr "Markera nod under pekare."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "Infoga ny nod i väg."
+msgstr[1] "Infoga ny nod i {0} vägar."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+msgid "Start new way from last node."
+msgstr "Starta ny väg från senaste nod."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+msgid "Continue way from last node."
+msgstr "Fortsätt väg från senaste nod."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+msgid "Finish drawing."
+msgstr "Avsluta ritning."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+msgid "Extrude"
+msgstr "Dra ut"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+msgid "Create areas"
+msgstr "Skapa ytor"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+msgid "Extrude Way"
+msgstr "Dra ut sträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Släpp musknappen för att välja objekten i rektangeln."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to stop rotating."
+msgstr "Släpp musknappen för att sluta rotera."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
+msgid "Drag a way segment to make a rectangle."
+msgstr "Dra en delsträcka för bilda en rektangel."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud "
+"därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+msgid "Select"
+msgstr "Markera"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+msgid "Select, move and rotate objects"
+msgstr "Välj, flytta och rotera objekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "Lägg till och flytta en virtuell ny nod till väg."
+msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+msgid "Move elements"
+msgstr "Flytta element"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+"Du flyttade mer än {0} element. Flytt av ett stort antal element är ofta ett "
+"fel.\n"
+"Vill du verkligen flytta på dem?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgid "Move them"
+msgstr "Flytta"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgid "Undo move"
+msgstr "Ångra flytt"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Släpp musknappen för att sluta flytta. Ctrl för att slå ihop med närmaste "
+"nod."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för att "
+"växla läge); Skift+Ctrl för att rotera"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+msgid "Zoom"
+msgstr "Zooma:"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom and move map"
+msgstr "Zooma och flytta kartan"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"Zooma genom att dra eller Ctrl+. eller Ctrl+,; flytta med Ctrl+upp, vänster, "
+"ned, höger; flytta karta med högerknappen"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46
+msgid "Search..."
+msgstr "Sök..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Search for objects."
+msgstr "Sök efter objekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
+msgid "Can't search because there is no loaded data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
+msgid "Please enter a search string."
+msgstr "Ange en söksträng."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "replace selection"
+msgstr "ersätt urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "add to selection"
+msgstr "utöka urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
+msgid "remove from selection"
+msgstr "ta bort från urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+msgid "case sensitive"
+msgstr "gör skillnad på gemener/VERSALER"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
+msgid "regular expression"
+msgstr "reguljärt uttryck"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
+msgstr ""
+"<b>Baker Street</b> - 'Baker' och 'Street' i vilken nyckel eller vilket "
+"värde som helst."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
+msgstr ""
+"<b>\"Baker Street\"</b> - 'Baker Street' i vilken nyckel eller vilket värde "
+"som helst."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
+msgstr "<b>name:Bak</b> - 'Bak' var som helst i nyckeln name."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+msgid ""
+"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+msgstr "<b>-name:Bak</b> - som inte har 'Bak'  i nyckeln name."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr "<b>foot:</b> - som innehåller nyckeln foot oavsett dess värde."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+msgid "<u>Special targets:</u>"
+msgstr "<u>Särskilda mål:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>type:</b> - elementets typ (<b>node</b> för nod, <b>way</b> för sträcka, "
+"<b>relation</b> för relation)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>user:</b>... - alla objekt som ändrats av användare..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgid "<b>id:</b>... - object with given ID"
+msgstr "<b>id:</b>... - objektet med angiven ID"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+msgid "<b>nodes:</b>... - object with given number of nodes"
+msgstr "<b>nodes:</b>... - objekt med givent antal noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>modified</b> - alla ändrade objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>selected</b> - alla valda objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>incomplete</b> - alla ofullständiga objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+msgid "<b>untagged</b> - all untagged objects"
+msgstr "<b>otaggade</b> - alla otaggede objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
+msgstr ""
+"Use <b>\"</b> för att sätta operatorer inom citattecken (t ex om nyckeln "
+"innehåller :)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Search"
+msgstr "Sök"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+msgid "Start Search"
+msgstr "Påbörja sökning"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "Inga sökträffar för ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "Urvalet begränsades inte genom att söka efter ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#, java-format
+msgid "Found {0} matches"
+msgstr "{0} sökträffar"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+msgid "CS"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+msgid "CI"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
+msgid "RX"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"Det reguljära uttrycket \"{0}\" orsakade tolkningsfel vid offset {1}, "
+"fullständigt fel:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#, java-format
+msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+msgid "Missing arguments for or."
+msgstr "Det saknas argument för eller (or)."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+msgid "Missing argument for not."
+msgstr "Det saknas argument för inte (not)."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+msgid "Expected closing parenthesis."
+msgstr "En avslutande parentes förväntades"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+msgid "Wrong number of parameters for nodes operator."
+msgstr "Felaktigt antal parametrar för nodoperator."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#, java-format
+msgid "Incorrect value of id operator: {0}. Number is expected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35
+msgid "Load Selection"
+msgstr "Hämta urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
+#, java-format
+msgid "Contact {0}..."
+msgstr "Kontakta {0}..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48
+msgid "Downloading..."
+msgstr "Hämtar..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81
+#, java-format
+msgid "Could not read from URL: \"{0}\""
+msgstr "Kunde inte läsa från URL:en: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
+#, java-format
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Inläsningsfel på URL:en: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
+msgid "Error while communicating with server."
+msgstr "Fel under kommunikation med servern."
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65
+#, java-format
+msgid "Add {0} {1}"
+msgstr "Lägg till {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47
+#, java-format
+msgid "Change {0} {1}"
+msgstr "Ändra {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101
+#, java-format
+msgid "Remove \"{0}\" for {1} ''{2}''"
+msgstr "Ta bort \"{0}\" för {1} ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Set {0}={1} for {2} ''{3}''"
+msgstr "Sätt {0}={1} för {2} ''{3}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "objekt"
+msgstr[1] "objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114
+#, java-format
+msgid "Remove \"{0}\" for {1} {2}"
+msgstr "Ta bort \"{0}\" för {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#, java-format
+msgid "Set {0}={1} for {2} {3}"
+msgstr "Sätt {0}={1} för {2} {3}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict can't be added.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
+#, fuzzy
+msgid "Double conflict"
+msgstr "Jämka konflikt"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
+#, java-format
+msgid ""
+"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
+"primitmive ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
+#, fuzzy, java-format
+msgid "Add conflict for ''{0}''"
+msgstr "Inga sökträffar för ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+"Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är "
+"närvarande"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+msgid "cannot resolve undecided conflict"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Ta bort {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Ta bort {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+msgid "Conflicting relation"
+msgstr "Relationskonflikt"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n"
+"Ta bort från relationen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+msgid "Delete from relation"
+msgstr "Ta bort från relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
+"Ta bort från relationen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+msgid "Split way segment"
+msgstr "Dela delsträcka"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
+"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
+"använder dem.<br> Vill du verkligen ta bort dem?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
+#, fuzzy
+msgid "Delete confirmation"
+msgstr "Ta bort från relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+msgid "Move"
+msgstr "Flytta"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "nod"
+msgstr[1] "noder"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "raderar referens från relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Radera relationsmedlem {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, java-format
+msgid "Rotate {0} {1}"
+msgstr "Rotera {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Lös {0} taggninskonfliker i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Ångra radering av {0} primitiv"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Lös versionskonfliker för {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Lös konflikter i nodlistan för väg {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Tillämpa?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
+"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Gammal roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Ny roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Gammal nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Gammalt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nytt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Verkställ valda ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Verkställ inte ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Egenskaper för "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatisk taggrättning"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Fel i konfigurationsfilen på raderna {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan inte öppna inställningsmappen: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Inställningar lagrade på {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Kunde inte hämta inställningar från server."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
 msgstr ""
 
@@ -2619,34 +2917,34 @@
 msgstr "Ö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
+msgstr "parameter {0} > 0 krävs. Erhöll {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
 msgid "Error: {0}"
 msgstr "Fel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
 msgid "Warning: {0}"
 msgstr "Varning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "nodes"
 msgstr "noder"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
 msgid_plural "ways"
@@ -2654,13 +2952,13 @@
 msgstr[1] "sträckor"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "ways"
 msgstr "vägar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
 msgid_plural "relations"
@@ -2668,22 +2966,22 @@
 msgstr[1] "relationer"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 msgid "relations"
 msgstr "relationer"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 msgid "changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 msgid "changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2697,23 +2995,23 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
 msgid "highway"
 msgstr "landsväg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "järnväg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
 msgid "waterway"
 msgstr "vattendrag"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
 msgid "landuse"
 msgstr "markanvändning"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
 msgid "{0} node"
@@ -2742,5 +3040,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
+msgstr "ingen senaste version funnen. Historiken är tom."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
@@ -2760,5 +3058,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-msgstr ""
+msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -2768,5 +3066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
@@ -2904,9 +3202,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
-#, java-format
-msgid " [id: {0}]"
-msgstr " [id: {0}]"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
 msgid "inactive"
@@ -2923,5 +3216,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160
 msgid "background"
 msgstr "bakgrund"
@@ -2932,8 +3225,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
-msgid "WGS84 Geographisch"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
+msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2949,5 +3242,5 @@
 "och börja på ett nytt lager i den nya zonen."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144
 msgid "Lambert Zone (France)"
 msgstr "Lambertzon (Frankrike)"
@@ -2970,22 +3263,139 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
-msgid "Could not read bookmarks."
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#, fuzzy, java-format
+msgid "<html>Could not read bookmarks.<br>{0}</html>"
 msgstr "Kunde inte läsa bokmärken."
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
-msgid "Could not write bookmark."
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
+#, fuzzy, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr "Kunde inte skriva bokmärken."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
+msgid "Do not show again"
+msgstr "Visa inte igen"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#, java-format
+msgid ""
+"Failed to initialize communication with the OSM server {0}.\n"
+"Check the server URL in your preferences and your internet connection."
+msgstr ""
+"Kunde inte upprätta anslutning till OSM servern {0}.\n"
+"Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
+"inställningar."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#, java-format
+msgid ""
+"<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:66
+msgid "Precondition violation"
+msgstr "Brott mot förhandsvillkor"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:1314
+#: build/trans_presets.java:1376
+msgid "unknown"
+msgstr "okänd"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#, java-format
+msgid ""
+"<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:117
+#, fuzzy
+msgid "Security exception"
+msgstr "Oväntat undantag"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+"Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#, fuzzy, java-format
+msgid ""
+"<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 ""
+"Kunde inte upprätta anslutning till OSM servern {0}.\n"
+"Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
+"inställningar."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+msgid "Unknown host"
+msgstr "Okänd värddator"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#, java-format
+msgid ""
+"<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:277
+msgid "Primitive already deleted"
+msgstr "Primitiv redan raderad"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
+#, java-format
+msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
 msgid "Message of the day not available"
 msgstr "Dagens meddelande är inte tillgängligt"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
 #, java-format
 msgid "- running version is {0}"
 msgstr "- nuvarande version är {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
 msgid "Downloading \"Message of the day\""
 msgstr "Hämtar \"Dagens meddelande\""
@@ -3066,63 +3476,57 @@
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
-#, java-format
-msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr ""
-"Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Öppna fil (som rå gps, om .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Set the language."
 msgstr "Ange språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3132,51 +3536,51 @@
 "data innan --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Istället för --download=<bbox> kan du använda osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
 msgid "Activating updated plugins"
 msgstr "Aktiverar uppdaterade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 msgid "File"
 msgstr "Arkiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
 msgid "View"
 msgstr "Visa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
 msgid "Tools"
 msgstr "Verktyg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Presets"
 msgstr "Snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
 msgid "Menu: {0}"
@@ -3184,21 +3588,21 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231
 msgid "Wireframe View"
 msgstr "Trådnätsvisning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233
 msgid "Toggle Wireframe view"
 msgstr "Växla trådnätsvisning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259
 msgid "Full Screen"
 msgstr "Fullskärm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261
 msgid "Toggle Full Screen view"
 msgstr "Växla mellan fullskärmsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
 msgid "Audio"
 msgstr "Ljud"
@@ -3242,53 +3646,68 @@
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiska longituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The name of the object at the mouse pointer."
 msgstr "Namnet på objektet vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiska latituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinkeln mellan föregående och pågående delsträcka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassriktning för den delsträcka som ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The length of the new way segment being drawn."
 msgstr "Längden hos den nya delsträcka som håller på att ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167
 msgid "(no object)"
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
 msgid "layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
-#, java-format
-msgid "Layer {0} must be in list of layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
-msgid "Contacting the OSM server..."
-msgstr "Ansluter till OSM-servern"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#, java-format
+msgid "Layer ''{0}'' must be in list of layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#, java-format
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63
+#, java-format
+msgid ""
+"Warning: failed to put ''please wait dialog'' always on top. Exception was: "
+"{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
 msgid "Error while parsing"
 msgstr "Fel vid tolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
 msgid "File not found"
 msgstr "Filen hittades inte"
+
+#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3310,4 +3729,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initierar"
@@ -3339,20 +3759,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
 msgid "Tags"
 msgstr "Taggar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3360,47 +3780,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3408,25 +3828,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
 msgid "Conflict Resolution"
 msgstr ""
@@ -3463,5 +3883,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
@@ -3472,5 +3892,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
@@ -3484,5 +3904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
@@ -3557,7 +3977,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3631,14 +4050,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
 msgid "parameter '{0}' must not be null"
 msgstr ""
@@ -3667,10 +4086,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3679,19 +4098,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ja, återskapa dem också"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nej, avbryt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3702,9 +4121,9 @@
 "raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Återskapa ytterligare noder?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3714,13 +4133,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3728,90 +4147,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "raderad"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -3821,5 +4240,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
@@ -3844,12 +4263,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
@@ -3894,10 +4312,10 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3906,10 +4324,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3918,5 +4336,5 @@
 msgstr "Värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
@@ -3976,9 +4394,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -3986,5 +4404,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75
 #, java-format
 msgid "Toggle: {0}"
@@ -4015,42 +4433,59 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
 msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141
+msgid ""
+"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
+"Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+msgid "Cancel conflict resolution and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186
+msgid "Apply resolved conflicts and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
+msgid "Apply Resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
+#, fuzzy
+msgid "Close anyway"
+msgstr "Fortsätt ändå"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
+msgid "Continue resolving"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
+#, java-format
+msgid ""
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
+msgid "Conflict not resolved completely"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
 msgid "Resolve conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
-msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
-msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
-msgid "Apply Resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
-msgid "Apply partial resolutions"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
-msgid "Continue resolving"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
-#, java-format
-msgid ""
-"<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-"strong> to apply already resolved conflicts anyway.<br>You can resolve the "
-"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-"resolving conflicts.</html>"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#, fuzzy, java-format
+msgid "Resolve conflicts for ''{0}''"
+msgstr "Lös versionskonfliker för {0} {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4068,96 +4503,130 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
 #, java-format
 msgid "index out of bounds Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366
 msgid "History item"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387
 msgid "Load history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414
 #, java-format
 msgid "Loading history for {0} with id {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Läs om alla de nu valda objekten och uppdatera listan."
 
 #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475
 msgid "Display the history of the selected primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+msgid "Layers"
+msgstr "Lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+msgid "Open a list of all loaded layers."
+msgstr "Öppna en lista av alla inlästa lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
 msgid "Delete the selected layer."
 msgstr "Ta bort valt lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80
-msgid "There are unsaved changes. Delete the layer anwyay?"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
+#, fuzzy, java-format
+msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr "Det finns osparade ändringar. Skall lagret tas bort i alla fall?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
 msgid "Delete Layer"
 msgstr "Ta bort lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
-msgid "Do you really want to delete the whole layer?"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
+#, fuzzy, java-format
+msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Vill du verkligen ta bort hela lagret?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
+#, fuzzy
+msgid "Confirmation"
+msgstr "Information"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+#, fuzzy
+msgid "Yes"
+msgstr "ja"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
+#, fuzzy
+msgid "No"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#, fuzzy
+msgid "Delete all"
+msgstr "Ta bort"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#, fuzzy, java-format
+msgid "Deleting layer {0} of {1}"
+msgstr "Ta bort {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
 msgid "Toggle visible state of the selected layer."
 msgstr "Alternera visning av det valda lagret."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123
-msgid "Show/Hide Text/Icons"
-msgstr "Visa/Dölj text/ikoner"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Växla visning av markörtext och ikoner."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
-msgid "Layers"
-msgstr "Lager"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-msgid "Open a list of all loaded layers."
-msgstr "Öppna en lista av alla inlästa lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#, fuzzy
+msgid "Activate"
+msgstr "privat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
+#, fuzzy
+msgid "Activate the selected layer"
+msgstr "Ta bort valt lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
+#, fuzzy
+msgid "Merge this layer into another layer"
+msgstr "Slå ihop det lager som finns precis under med det valda lagret."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row up."
 msgstr "Flytta det valda lagret en rad upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-msgid "Merge the layer directly below into the selected layer."
-msgstr "Slå ihop det lager som finns precis under med det valda lagret."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, java-format
-msgid "Layers: {0}"
-msgstr "Lager: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
+#, fuzzy
+msgid "Information about layer"
+msgstr "Mer information om denna funktion"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 #, java-format
 msgid "This will change up to {0} object."
@@ -4166,22 +4635,28 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
 msgid "An empty value deletes the key."
 msgstr "Om värdet är tomt tas nyckeln bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#, java-format
+msgid ""
+"Warning: failed to put properties dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4190,84 +4665,89 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#, java-format
+msgid "Warning: failed to put dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Please select the objects you want to change properties for."
 msgstr "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
 msgid "Edit Properties"
 msgstr "Redigera egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
@@ -4276,63 +4756,65 @@
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 msgid "Open a list of all relations."
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#, java-format
+msgid "Relations: {0}"
+msgstr "Relationer: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+msgid "Open an editor for the selected relation"
+msgstr "Öppna en redigerare för den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+msgid "Delete the selected relation"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139
-#, java-format
-msgid "Relations: {0}"
-msgstr "Relationer: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245
-msgid "Open an editor for the selected relation"
-msgstr "Öppna en redigerare för den valda relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274
-msgid "Delete the selected relation"
-msgstr "Ta bort den valda relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Current Selection"
 msgstr "Aktuellt urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 msgid "Open a selection list window."
 msgstr "Öppna en urvalslista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
 msgid "Zoom to selected element(s)"
 msgstr "Zooma till valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Uppdatera urvalslistan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
 #, java-format
 msgid "{0} way"
@@ -4341,5 +4823,5 @@
 msgstr[1] "{0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
 #, java-format
 msgid "{0} relation"
@@ -4348,5 +4830,5 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "Selection: {0}"
@@ -4357,5 +4839,10 @@
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167
+#, java-format
+msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4364,143 +4851,411 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125
 msgid "Authors"
 msgstr "Upphovsmän"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
 msgid "Open a list of people working on the selected objects."
 msgstr "Öppna en lista över de som arbetar med de valda objekten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59
 msgid "Author"
 msgstr "Upphovsman"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59
 msgid "# Objects"
 msgstr "# objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123
 #, java-format
 msgid "Authors: {0}"
 msgstr "Upphovsmän: {0}"
 
-#. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+msgid "Download all child relations (recursively)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
+#, fuzzy
+msgid "Download All Children"
+msgstr "Hämta område"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
+#, fuzzy
+msgid "Download selected relations"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
+#, fuzzy
+msgid "Download Selected Children"
+msgstr "Hämta de rutor som syns"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+msgid "Download relation members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488
+msgid "Conflicts in data"
+msgstr "Datakonflikter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+"loaded"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
+#, fuzzy
+msgid "Relation is deleted"
+msgstr "Relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
+#, fuzzy, java-format
+msgid "Downloading relation {0}"
+msgstr "Hämtar {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+msgid "Tags and Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+msgid "Parent Relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
+#, fuzzy
+msgid "Child Relations"
+msgstr "Relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
+#, java-format
+msgid ""
+"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+msgstr ""
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+msgid "Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+msgid ""
+"<html>There is at least one member in this relation referring<br>to the "
+"relation itself.<br>This creates circular dependencies and is dicuraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
+#, fuzzy
+msgid "Remove them, clean up relation"
+msgstr "Tog bort element från relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgid "Ignore them, leave relation as is"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#, java-format
+msgid ""
+"<html>This relation already has one or more members referring to<br>the "
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+msgid "Multiple members referring to same primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#, java-format
+msgid ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+msgid ""
+"Add all primitives selected in the current dataset before the first member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+msgid ""
+"Add all primitives selected in the current dataset after the last member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+msgid ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+msgid ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#, fuzzy
+msgid "Remove all members referring to one of the selected primitives"
+msgstr "Misslyckades med att uppdatera markerade primitiv."
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Sort the relation members"
+msgstr ""
+
+#. putValue(NAME, tr("Sort"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+msgid "Relation Editor: Sort"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+msgid "Move the currently selected members up"
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#. putValue(NAME, tr("Move Up"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+msgid "Relation Editor: Move Up"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+msgid "Move the currently selected members down"
+msgstr "Flytta vald medlem/valda medlemmar nedåt"
+
+#. putValue(NAME, tr("Move Down"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+msgid "Relation Editor: Move Down"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
+#, fuzzy
+msgid "Remove the currently selected members from this relation"
+msgstr "Ta bort alla för närvarande valda objekt från relationen"
+
+#. putValue(NAME, tr("Remove"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+msgid "Relation Editor: Remove"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#, fuzzy
+msgid "Delete the currently edited relation"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgid "Yes, create a conflict and close"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#, fuzzy
+msgid "No, continue editing"
+msgstr "Inte ansluten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You can't "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
+#, fuzzy
+msgid "Conflict in data"
+msgstr "Datakonflikter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#, fuzzy
+msgid "Apply the current updates"
+msgstr "Spara nuvarande data."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgid "Apply"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+msgid "Cancel the updates and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+msgid "Add an empty tag"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+msgid "Delete the currently selected tags"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+msgid "Download all incomplete ways and nodes in relation"
+msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+msgid "Download Members"
+msgstr "Hämta medlemmar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+msgid "Relation Editor: Download Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+msgid "Sets a role for the selected members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+msgid "Apply Role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#, java-format
+msgid ""
+"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
+"deleting the roles of these primitives.<br>Do you really want to apply the "
+"new role?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+msgid "Yes, apply it"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "No, don't apply"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#, fuzzy
+msgid "Confirm empty role"
+msgstr "Bekräfta fjärrstyrd handling"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
+#, fuzzy
+msgid "Zoom to"
+msgstr "Zooma ut"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
+#, fuzzy
+msgid "Zoom to primitive the first selected member refers to"
+msgstr "Flytta vald medlem/valda medlemmar nedåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+msgid "Zooming disabled because layer of this relation is not active"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
+msgid "Zooming disabled because there is no selected member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
+msgid "Refers to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
+msgid "Linked"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+msgid "Download referring relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.id >0 expected. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
+msgid "including immediate children of parent relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+msgid "Load parent relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157
+msgid "Edit the currently selected relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 msgid "Apply Changes"
 msgstr "Verkställ ändringar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182
-msgid "Basic"
-msgstr "Grundläggande"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
-msgid "Occupied By"
-msgstr "Innehas av"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
-msgid "linked"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310
-msgid "Move Up"
-msgstr "Flytta uppåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310
-msgid "Move the currently selected members up"
-msgstr "Flytta vald medlem/valda medlemmar uppåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316
-msgid "Add Selected"
-msgstr "Lägg till vald"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317
-msgid "Add all currently selected objects as members"
-msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323
-msgid "Remove Selected"
-msgstr "Ta bort det valda"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324
-msgid "Remove all currently selected objects from relation"
-msgstr "Ta bort alla för närvarande valda objekt från relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330
-msgid "Sort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
-msgid "Sort the selected relation members or the whole list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
-msgid "Move Down"
-msgstr "Flytta nedåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
-msgid "Move the currently selected members down"
-msgstr "Flytta vald medlem/valda medlemmar nedåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344
-msgid "Remove the member in the current table row from this relation"
-msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357
-msgid "Download Members"
-msgstr "Hämta medlemmar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358
-msgid "Download all incomplete ways and nodes in relation"
-msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733
-#, java-format
-msgid "Members: {0} (linked: {1})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741
-#, java-format
-msgid "Relation Editor: {0}"
-msgstr "Relationsredigerare:{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846
-msgid "Download relation members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902
-msgid "Conflicts in data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
-#, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118
 #, java-format
 msgid "Create new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #, java-format
 msgid "Edit new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122
 #, java-format
 msgid "Edit relation #{0} in layer ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
+#, fuzzy
+msgid "Load relation"
+msgstr "Hämta urval"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
+msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
@@ -4510,5 +5265,5 @@
 msgstr "<flera>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -4518,25 +5273,22 @@
 msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
-#, java-format
-msgid "Updating properties of up to {0} object"
-msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Uppdatera egenskaper för upp till {0} objekt"
-msgstr[1] "Uppdatera egenskaper för upp till {0} objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
 msgid "Please enter the desired coordinates first."
 msgstr "Ange först önskade koordinater."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
 msgid "Please enter a name for the location."
 msgstr "Ange platsens namn."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#, fuzzy
+msgid "Name of location"
+msgstr "Byt plats"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
 msgid "Select a bookmark first."
 msgstr "Välj ett bokmärke först."
@@ -4571,21 +5323,21 @@
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
 msgid "Data Sources and Types"
 msgstr "Datakällor och -typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
 msgid "Download as new layer"
 msgstr "Hämta som ett nytt lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
 msgid "Download Area"
 msgstr "Hämta område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -4593,13 +5345,13 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171
 msgid "Please enter a search string"
 msgstr "Ange en söksträng"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195
 msgid "Cannot read place search results from server"
 msgstr "Kan inte läsa sökresultat för plats från servern"
@@ -4607,5 +5359,5 @@
 #. this is manually tuned so that it looks nice on a GNOME
 #. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217
 msgid "Enter a place name to search for:"
 msgstr "Ange ett platsnamn att söka efter:"
@@ -4613,5 +5365,5 @@
 #. item "Health/Veterinary" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
 #: build/trans_presets.java:2612
 msgid "Places"
@@ -4619,6 +5371,6 @@
 
 #. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
 msgid "name"
 msgstr "namn"
@@ -4657,6 +5409,6 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -4679,15 +5431,15 @@
 msgstr "typ"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254
 msgid "near"
 msgstr "nära"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
 msgid "zoom"
 msgstr "zooma"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -4696,5 +5448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124
 msgid "Slippy map"
 msgstr "Glidande karta"
@@ -4726,5 +5478,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74
+#, java-format
+msgid ""
+"Warning: failed to put history browser always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121
 msgid "Close the dialog"
 msgstr ""
@@ -5466,5 +6224,5 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: build/trans_presets.java:64 build/trans_presets.java:100
 #: build/trans_presets.java:140 build/trans_presets.java:177
@@ -5631,59 +6389,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 msgid "Read GPX..."
 msgstr "Läs in GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Tid saknas för punkt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "No images with readable timestamps found."
 msgstr "Inga bilder med läsbara tidsangivelser hittades."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Läser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS startpunkt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS slutpunkt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nuvarande delta: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
 msgid "timezone difference: "
 msgstr "tidsskillnad: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 msgid "image"
 msgid_plural "images"
@@ -5691,138 +6449,128 @@
 msgstr[1] "bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} inom spåret."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
 msgid "Sync clock"
 msgstr "Synka klocka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datum i fil \"{0}\" kunde inte tolkas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
 msgid "Image"
 msgstr "Bild"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synkronisera Tid med GPS-enheten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
 msgid "Time entered could not be parsed."
 msgstr "Angiven tid kunde inte tolkas."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
 #, java-format
 msgid "{0} track, "
@@ -5831,5 +6579,5 @@
 msgstr[1] "{0} spår, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
 #, java-format
 msgid "{0} route, "
@@ -5838,5 +6586,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
 #, java-format
 msgid "{0} waypoint"
@@ -5845,30 +6593,30 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 #, java-format
 msgid "Name: {0}"
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
 msgid "Timespan: "
 msgstr "Tidsomfång: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -5878,43 +6626,43 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
 msgid "Download from OSM along this track"
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
 #, java-format
 msgid ""
@@ -5925,9 +6673,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -5937,5 +6685,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -5945,47 +6693,47 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalager {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} raderad.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6010,5 +6758,5 @@
 msgstr[1] "spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
 msgid "point"
 msgid_plural "points"
@@ -6016,5 +6764,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #, java-format
 msgid "a track with {0} point"
@@ -6023,5 +6771,5 @@
 msgstr[1] "ett spår med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6030,5 +6778,5 @@
 msgstr[1] "{0} består av {1} spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} point"
@@ -6047,5 +6795,5 @@
 msgstr[1] "markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6054,29 +6802,29 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
 msgid "Synchronize Audio"
 msgstr "Synkronisera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Du behöver pausa ljudet precis när du hör synkroniseringsindikatorn."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ljud synkroniserat vid punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Det går inte att synkronisera i det lager som spelas upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6086,10 +6834,17 @@
 "markören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+msgid "Show/Hide Text/Icons"
+msgstr "Visa/Dölj text/ikoner"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Växla visning av markörtext och ikoner."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -6097,5 +6852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -6105,29 +6860,29 @@
 "spårpunkt där du vill synkronisera."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 msgid "Unable to create new audio marker."
 msgstr "Kunde inte skapa ny ljudmarkör."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Fel uppstod vid visning av URL:en för denna markör."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "(URL was: "
 msgstr "(URL:en var: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46
 msgid "Error displaying URL"
 msgstr "Fel vid visning av URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
 msgid "Advanced Preferences"
 msgstr "Avancerade inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ange inställningar direkt. Använd med försiktighet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -6135,27 +6890,27 @@
 msgstr "Sök: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
 msgid "Current value is default."
 msgstr "Nuvarande värde är förval."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Nuvarande värde är ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "Förvalt värde är för närvarande okänt (inställningen har inte använts än)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Please select the row to edit."
 msgstr "Välj vilken rad du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
@@ -6163,14 +6918,14 @@
 msgstr "Nytt värde för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96
 msgid "Please select the row to delete."
 msgstr "Välj vilken rad du vill ta bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270
 msgid "Enter a new key/value pair"
 msgstr "Ange ett nytt nyckel/värde-par"
@@ -6306,40 +7061,40 @@
 msgstr "Kalibrering av röstinspelare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 msgid "Color"
 msgstr "Färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Ritstil{0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lager: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Välj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Välj en färg för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Sätt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Sätt allt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "De färger som används av olika objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Färger"
@@ -6680,46 +7435,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46
 msgid "Configure available plugins."
 msgstr "Ställ in tillgängliga insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
 msgid "Download List"
 msgstr "Hämta lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
 msgid "Configure Sites..."
 msgstr "Konfigurera hämtställen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
+msgid "Enter URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
 msgid "Please select an entry."
 msgstr "Välj en post."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
+msgid "JOSM Plugin description URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
 msgid "Configure Plugin Sites"
 msgstr "Konfigurera hämtställen för insticksmoduler"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Display Settings"
 msgstr "Visningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6728,29 +7491,29 @@
 "Olika inställningar som påverkar hur hela programmet representeras visuellt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Connection Settings"
 msgstr "Anslutningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Connection Settings for the OSM server."
 msgstr "Anslutningsinställningar för OSM-servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Map Settings"
 msgstr "Kartinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the map projection and data interpretation."
 msgstr "Inställningar för kartprojektion och datatolkning."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Audio Settings"
 msgstr "Ljudinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Settings for the audio player and audio markers."
 msgstr "Inställnignar för ljudspelare och ljudmarkörer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -6853,59 +7616,61 @@
 msgstr "Kortkommando"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296
 msgid "Icon paths"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246
 msgid "Copy defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114
 msgid "Please select the row to copy."
 msgstr "Välj vilken rad du vill kopiera."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276
 #, java-format
 msgid "The XML source (URL or filename) for {0} definition files."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277
 msgid "Add a new XML source to the list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 msgid "Delete the selected source from the list."
 msgstr "Ta bort vald källa från listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284
 msgid "Defaults (See tooltip for detailed information)"
 msgstr ""
@@ -7099,33 +7864,33 @@
 msgstr "Modifierargrupper"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Använd snabbval ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
 msgid "closedway"
 msgstr "slutenväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
@@ -7136,15 +7901,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekt av typ {0} stöds."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -7154,18 +7919,18 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756
 msgid "Change Properties"
 msgstr "Ändra egenskaper"
@@ -7176,33 +7941,36 @@
 msgstr "Snabbvalsgrupp ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
 msgstr "Ansluter till OSM-servern..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
 #, java-format
 msgid "Downloading points {0} to {1}..."
 msgstr "Hämtar punkter {0} till {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
-msgid "Downloading OSM data..."
-msgstr "Hämtar OSM-data..."
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Det saknas förmodligen några taggar."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69
 msgid "Preparing data..."
 msgstr "Förbereder data..."
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kunde inte öppna \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
@@ -7210,21 +7978,21 @@
 msgstr "GPX-filer"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124
 #, java-format
 msgid "Markers from {0}"
 msgstr "Markörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -7240,10 +8008,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
+msgid "Downloading OSM data..."
+msgstr "Hämtar OSM-data..."
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
+#, java-format
+msgid "Fetching {0} with id {1} from ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
+#, java-format
+msgid "Fetching a package of {0} from ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -7251,48 +8038,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183-filer"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
 msgid "Coordinates imported: "
 msgstr "Koordinater importerade: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Malformed sentences: "
 msgstr "Felaktigt utformade meningar: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
 msgid "Checksum errors: "
 msgstr "Checksum-fel: "
 
-#. don't scare the user unneccessarily
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
 msgid "Unknown sentences: "
 msgstr "Okända meningar: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "Zero coordinates: "
 msgstr "Nollkoordinater: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
 msgid "NMEA import success"
 msgstr "Import från NMEA genomförd"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
 msgid "NMEA import faliure!"
 msgstr "Import från NMEA misslyckades!"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
 msgid "preference ''{0}'' missing. Can't initialize OsmApi"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
 #, java-format
 msgid ""
@@ -7301,15 +8087,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177
 #, java-format
 msgid "Communications with {0} established using protocol version {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -7317,23 +8103,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286
 msgid "Opening changeset..."
 msgstr "Öppnar ändringssamling..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305
 msgid "Closing changeset..."
 msgstr "Stänger ändringssamling..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339
 msgid "Uploading..."
 msgstr "Skickar in..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
+msgid "Waiting 10 seconds ... "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
+msgid "OK - trying again."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
+#, fuzzy, java-format
+msgid "Starting retry {0} of {1}."
+msgstr "Läser igenom folder {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7376,9 +8175,4 @@
 msgid "Login"
 msgstr "Logga in"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
-msgid "Aborting..."
-msgstr "Avbryter..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
@@ -7429,66 +8223,70 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
+msgid "Parsing OSM history data ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
 msgstr "Fel vid tolkning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "OSM serverfiler"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
 msgid "Unknown version"
 msgstr "Okänd version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 msgid "Found <nd> element in non-way."
 msgstr "Hittade element av typen <nd> på icke-sträcka"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
 msgid "<nd> has zero ref"
 msgstr "<nd> har nollreferens"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 msgid "Found <member> element in non-relation."
 msgstr "Fann <member>-tagg utanför relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
 #, java-format
 msgid "Missing attribute \"ref\" on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
 #, java-format
 msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 #, java-format
 msgid "Missing attribute \"type\" on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
 #, java-format
 msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 msgid "Illegal object with id=0"
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
 #, java-format
 msgid ""
@@ -7496,47 +8294,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Det nödvändiga attributet \"{0}\" saknas."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
-#, java-format
-msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-msgstr ""
-"Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#, java-format
+msgid ""
+"marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
 msgid "Ill-formed node id"
 msgstr "Felformaterad nod-id"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
+#, java-format
+msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#, java-format
+msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+msgid "Downloading referring ways ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
+msgid "Downloading referring relations ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
 msgid "Downloading history..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
 msgid "Contacting Server..."
 msgstr "Tar kontakt med servern..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -7544,5 +8361,18 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
+msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
+#, java-format
+msgid ""
+"Failed to close changeset {0}, will be closed by server after timeout. "
+"Exception was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172
 #, java-format
 msgid ""
@@ -7551,16 +8381,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
-#, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "Update Plugins"
 msgstr "Uppdatera insticksmoduler"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
 msgid "Download Plugins"
 msgstr "Hämta insticksprogram"
@@ -7578,5 +8403,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7585,23 +8410,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
 msgid "Skip Download"
 msgstr ""
@@ -7612,19 +8437,17 @@
 msgstr "Fel uppstod i insticksmodulen {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
-#, java-format
-msgid ""
-"Warning - loading of {0} plugin was requested. This plugin is no longer "
-"required."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
+#, fuzzy, java-format
+msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 "Varning - insticksmodulen {0} har begärts. Denna insticksmodul behövs inte "
 "längre."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -7633,15 +8456,15 @@
 "inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Insticksmodulen kunde ej hittas: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -7651,12 +8474,12 @@
 "med hjälp av inställningen 'pluginmanager.warntime'.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 msgid "Disable plugin"
 msgstr "Avaktivera insticksmodul"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -7665,9 +8488,9 @@
 "inställningarna?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 msgid "Keep plugin"
 msgstr "Behåll plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7677,5 +8500,5 @@
 "JOSM har behörighet att skriva över de existerande."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
 #, java-format
 msgid ""
@@ -7684,10 +8507,10 @@
 "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7696,9 +8519,9 @@
 "innan du rapporterar en bugg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 msgid "Should the plugin be disabled?"
 msgstr "Skall insticksmodulen avaktiveras?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7708,27 +8531,23 @@
 "frigöra insticksmodulen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
-msgid ""
-"The plugin could not be removed. Please tell the people you got JOSM from "
-"about the problem."
-msgstr ""
-"Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
-"JOSM från."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
-msgid "Information"
-msgstr "Information"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+msgid "The plugin could not be removed. Probably it was already disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
+#, fuzzy
+msgid "Plugin information"
+msgstr "Kunde inte hitta någon information om insticksmoduler."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
 msgstr "ingen beskrivning tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7737,13 +8556,18 @@
 msgstr[1] "Hämtade information om insticksmoduler från {0} ställen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 msgid "No plugin information found."
 msgstr "Kunde inte hitta någon information om insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#, java-format
+msgid "Plug-in named {0} is not available. Update skipped."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 msgid "All installed plugins are up to date."
 msgstr "Alla installerade insticksmoduler är av senaste version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102
 #, java-format
 msgid ""
@@ -7756,9 +8580,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137
 msgid "Download missing plugins"
 msgstr "Hämta saknade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
 #, java-format
 msgid ""
@@ -7771,57 +8595,35 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:323
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
-msgid "unknown"
-msgstr "okänd"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221
 msgid "Plugin bundled with JOSM"
 msgstr "Insticksmodul som medföljer JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr "Fel vid inläsning av informationsfil för insticksmodul: {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302
 msgid "This is after the end of the recording"
 msgstr "Detta är slutet av inspelningen"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344
 msgid "Error playing sound"
 msgstr "Fel vid uppspelning av ljud"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Report Bug"
 msgstr "Rapportera en bugg"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7835,14 +8637,14 @@
 "lämna in en felrapport."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58
 msgid "Unexpected Exception"
 msgstr "Oväntat undantag"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 #, java-format
 msgid "Please report a ticket at {0}"
 msgstr "Lämna in en rapport på {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
 msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr ""
@@ -7850,5 +8652,5 @@
 "möjligt)!"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7858,17 +8660,34 @@
 "versionen av JOSM och alla insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Be sure to include the following information:"
 msgstr "Följande information måste finnas med:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Texten finns redan i urklipp.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
-msgid "Do not show again"
-msgstr "Visa inte igen"
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119
+#, java-format
+msgid "Unable to find translation for the locale {0}. Reverting to {1}."
+msgstr ""
+"Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181
+#, java-format
+msgid ""
+"Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
+#, java-format
+msgid ""
+"Fatal: failed to locate image ''{0}''. This is a serious configuration "
+"problem. JOSM will stop working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
 #, java-format
 msgid ""
@@ -7882,5 +8701,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452
 msgid ""
 "This action will have no shortcut.\n"
@@ -7890,5 +8709,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454
 #, java-format
 msgid ""
@@ -7899,13 +8718,28 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tips: Du kan själv välja kortkommandon i inställningarna.)"
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88
+#, java-format
+msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81
+#, java-format
+msgid ""
+"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
 msgstr "Skapa ett nätverk av sträckor"
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid ""
 "Forms a grid of ways in base to two existing that have various nodes and one "
@@ -7913,21 +8747,21 @@
 msgstr ""
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
 msgid "Select two ways with a node in common"
 msgstr "Välj två sträckor som delar en nod."
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
 msgid "Select two ways with alone a node in common"
 msgstr ""
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
 msgid "Create a grid of ways"
 msgstr "Skapa ett rutnät av sträckor"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70
 msgid "Upload Trace"
 msgstr "Skicka in spår"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -7935,74 +8769,75 @@
 msgstr "Skicka in spår"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98
 msgid "Public"
 msgstr "Publik"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99
 msgid "Selected makes your trace public in openstreetmap.org"
 msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
 #: build/trans_presets.java:3006
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
 msgid "Please enter Description about your trace."
 msgstr "Ange beskrivning för ditt spår."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
 msgid "Please enter tags about your trace."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150
 #, java-format
 msgid "Selected track: {0}"
 msgstr "Valt spår: {0}"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177
+#. Set progress dialog to indeterminate while connecting
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196
 msgid "Upload cancelled"
 msgstr "Inskickning avbruten"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
 msgid "Error while uploading"
 msgstr "Fel vid inskickning"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
 msgid "GPX upload was successful"
 msgstr "GPX-inskickning genomförd"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
 msgid "Upload failed. Server returned the following message: "
 msgstr "Inskickning misslyckades. Servern returnerade följande meddelande: "
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Skickar in GPX-spår: {0}% ({1} av {2})"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335
 msgid "No description provided. Please provide some description."
 msgstr "Ingen beskrivning angiven. Skriv in en beskrivning."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Inget GPX-lager valt. Kan inte skicka in ett spår."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341
 msgid "No username provided."
 msgstr "Inget användarnamn angivet."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
 msgid "No password provided."
 msgstr "Inget lösenord angviet."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
 msgid "Uploading GPX Track"
 msgstr "Skickar in GPX-spår"
@@ -8072,33 +8907,34 @@
 msgstr "En av de valda filerna var null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8118,15 +8954,15 @@
 msgstr "GPX-filer"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fel vid tolkning {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -8138,34 +8974,34 @@
 "välj en tidzon<hr></html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
 msgid "Photo time (from exif):"
 msgstr "Fototid (från exif):"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
 msgid "Gps time (read from the above photo): "
 msgstr "Gps-tid (läst från fotot ovan): "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
 msgid "I'm in the timezone of: "
 msgstr "Jag är i följande tidzon: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
 msgid "No date"
 msgstr "Inget datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
 msgid "Open an other photo"
 msgstr "Öppna ett annat foto"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
 msgid ""
 "Error while parsing the date.\n"
@@ -8175,29 +9011,29 @@
 "Använd begärt format"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
 msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
 msgid "<No GPX track loaded yet>"
 msgstr "<Inget GPX-spår har hämtats än>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
 msgid "GPX track: "
 msgstr "GPX-spår: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
 msgid "Open another GPX trace"
 msgstr "Öppna ett annat foto"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
 msgid "Timezone: "
 msgstr "Tidszon: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
 msgid "Offset:"
 msgstr "Förskjutning:"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
@@ -8205,41 +9041,41 @@
 "</html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
 msgid "Update position for: "
 msgstr "Uppdatera position för: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
 msgid "All images"
 msgstr "Alla bilder"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
 msgid "Images with no exif position"
 msgstr "Bilder utan positionsangivelse i exif"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
 msgid "Not yet tagged images"
 msgstr "Bilder som inte taggats ännu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr "Sätt bilder i relation till GPX-spår"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 msgid "Correlate"
 msgstr "Korrelera"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 msgid "Auto-Guess"
 msgstr "Auto-gissa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
 #, java-format
 msgid ""
@@ -8250,9 +9086,9 @@
 "Förväntat format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
 #, java-format
 msgid ""
@@ -8263,26 +9099,26 @@
 "Förväntat format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr "Hittade {0} träffar för {1} i GPX-spår {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659
 msgid "GPX Track loaded"
 msgstr "GPX-spår har hämtats"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
 msgid "The selected photos don't contain time information."
 msgstr "De markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695
 msgid "Photos don't contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -8290,39 +9126,39 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Parade ihop {0} av {1} foton med GPX-spåret"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsdifferens om {0} dagar)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8330,13 +9166,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Default Values"
 msgstr "Standardinställningar"
@@ -8358,5 +9194,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
@@ -8379,6 +9215,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166
 msgid "CadastreGrabber: Illegal url."
 msgstr "CadastreGrabber: Ogiltig URL."
@@ -8550,22 +9386,22 @@
 msgstr "Lägg \"source=...\" till objekt?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21
 #, java-format
 msgid "Downloading {0}"
 msgstr "Hämtar {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29
 msgid "Contacting WMS Server..."
 msgstr "Kontaktar WMS-servern..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
 msgid "Create buildings"
 msgstr "Skapa byggnader"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265
 msgid ""
 "To avoid cadastre WMS overload,\n"
@@ -8573,18 +9409,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
 msgid "Extract best fitting boundary..."
 msgstr "Extrahera den gräns som passar bäst..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
 msgid "Create boundary"
 msgstr "Skapa gräns"
@@ -8697,6 +9533,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -8725,5 +9561,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384
 #, java-format
 msgid ""
@@ -8734,14 +9570,14 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -8829,4 +9665,9 @@
 msgstr "Skapa en dubblett av sträcka"
 
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
+msgid "No data loaded."
+msgstr "Ingen data har lästs in."
+
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
@@ -8837,9 +9678,9 @@
 msgstr "Skapa en dubblett av sträcka"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
 msgid "Layer for editing GPX tracks"
 msgstr "Lager för editering av GPX-spår"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertera till GPX-lager med anonymiserad tid"
@@ -8960,30 +9801,30 @@
 msgstr "ta bort data efter import"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43
 msgid "Importing data from device."
 msgstr "Importerar data från enhet."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
 msgid "Importing data from DG100..."
 msgstr "Importerar data från DG100..."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62
 msgid "Error deleting data."
 msgstr "Fel vid borttagning av data"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
 #, java-format
 msgid "imported data from {0}"
 msgstr "importerade data från {0}"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71
 msgid "No data found on device."
 msgstr "Ingen data återfanns på enheten."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76
 msgid "Connection failed."
 msgstr "Anslutning misslyckades."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95
 msgid ""
 "Cannot load library rxtxSerial. If you need support to install it try "
@@ -8995,14 +9836,14 @@
 "josm-globalsat-gpx-import-plugin/"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 msgid "Globalsat Import"
 msgstr "Globalsatimport"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importera data från en Globalsat Datalogger DG100 in i ett GPX-lager"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 msgid "Import"
 msgstr "Importera"
@@ -9093,40 +9934,40 @@
 msgstr "Öppna bilder med ImageWayPoint"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
 msgid "Direction index '{0}' not found"
 msgstr "Riktningsindex '{0}' kunde inte hittas"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
 msgid "The starting location was not within the bbox"
 msgstr "Startpositionen låg inte inom gränsvärdena (bbox)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
 msgid "Looking for shoreline..."
 msgstr "Letar efter strandlinje..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
 #, java-format
 msgid "{0} nodes so far..."
 msgstr "Hittills {0} noder..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51
 msgid "Lake Walker."
 msgstr "Lakewalker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr "Fel uppstod när cache-biblioteket skulle skapas: {0}"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151
 msgid "Tracing"
 msgstr "Spårar"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153
 msgid "checking cache..."
 msgstr "kontrollerar cache..."
@@ -9135,26 +9976,18 @@
 #. * Run the nodelist through a vertex reduction algorithm
 #.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193
 msgid "Running vertex reduction..."
 msgstr "Genomför hörnreduktion..."
 
-#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
-#. *
-#. * And then through douglas-peucker approximation
-#.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204
 msgid "Running Douglas-Peucker approximation..."
 msgstr "Utför Douglas-Peucker-approximation..."
 
-#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
-#. *
-#. * And then through a duplicate node remover
-#.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215
 msgid "Removing duplicate nodes..."
 msgstr "Tar bort dubblettnoder..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
 msgid "Lakewalker trace"
 msgstr "Spår från lakewalker"
@@ -9239,7 +10072,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:963 build/trans_style.java:980
-#: build/trans_style.java:996 build/trans_style.java:3355
-#: build/trans_style.java:3363
+#: build/trans_style.java:968 build/trans_style.java:985
+#: build/trans_style.java:1001 build/trans_style.java:3360
+#: build/trans_style.java:3368
 msgid "water"
 msgstr "vatten"
@@ -9395,9 +10228,9 @@
 msgstr "Inställningar för insticksmodulen Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
 msgid "Downloading image tile..."
 msgstr "Hämtar bildruta..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
 msgid "Could not acquire image"
 msgstr "Kunde inte skaffa en bild"
@@ -9643,18 +10476,18 @@
 msgstr "Okänd status för problemfall"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 msgid "Open Visible..."
 msgstr "Öppna det som syns..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
 msgid "Open only files that are visible in current view."
 msgstr "Öppna enbart filer som är synliga i nuvarande visningsläge."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
 msgid "No view open - cannot determine boundaries!"
 msgstr "Ingenting visas - kan inte fastställa gränser!"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -9681,33 +10514,33 @@
 msgstr "Firefox-applikationen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
 msgstr "hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "change the selection"
 msgstr "ändra urval"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the viewport"
 msgstr "ändra vad som visas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "confirm all Remote Control actions manually"
 msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "Remote Control"
 msgstr "Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "Settings for the Remote Control plugin."
 msgstr "Inställningar för insticksmodulen Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -9719,28 +10552,28 @@
 "applikationer i kommunikation med insticksmodulen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
@@ -10006,4 +10839,25 @@
 msgstr "Färgmarkera"
 
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] "Uppdatera egenskaper för upp till {0} objekt"
+msgstr[1] "Uppdatera egenskaper för upp till {0} objekt"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
+msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
+msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
+msgid ""
+"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+"found."
+msgstr ""
+
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -10261,34 +11115,34 @@
 msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Ange lat/lon för att gå direkt till plats."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Du kan också klistra in en URL från www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
 msgid "Zoom (in metres)"
 msgstr "Zoomnivå (meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 msgid "Jump there"
 msgstr "Gå direkt dit"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
 msgid "Jump to Position"
 msgstr "Gå direkt till plats"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
 msgid "Unable to parse Lon/Lat"
 msgstr "Kunde inte tolka lon/lat"
@@ -10323,6 +11177,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75
 msgid "Validation errors"
 msgstr "Valideringsfel"
@@ -10332,10 +11186,10 @@
 msgstr "Inga valideringsfel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164
 msgid "Grid"
 msgstr "Rutnät"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
 #, java-format
 msgid ""
@@ -10426,23 +11280,15 @@
 msgstr "Utför datavalidering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "Data med fel. Skicka in ändå?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 msgid "Open the validation window."
 msgstr "Öppna valideringslistan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
 msgid "Zoom to problem"
 msgstr "Zooma till problem"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
-msgid "Validate"
-msgstr "Validera"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
-msgid "Validate either current selection or complete dataset."
-msgstr "Validera antingen nuvarande urval eller hela datasetet."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
@@ -10515,23 +11361,23 @@
 msgstr "Korsande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Duplicated way nodes."
 msgstr "Dubbletter av noder på sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
 msgid "Checks for ways with identical consecutive nodes."
 msgstr "Letar efter sträckor med identiska noder i följd."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
 msgstr "Dubbletter av noder på sträckor"
@@ -10610,23 +11456,23 @@
 "felstavning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Egenskapskontrollerare:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ogiltig taggkontrollsrad - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ogiltig rättstavningsrad: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -10637,7 +11483,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ogiltig kombination av nyckel och värde"
@@ -10645,78 +11491,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Ritningsproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nyckeln ''{0}'' är ogiltig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Taggar med tomma värden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ogiltig egenskapsnyckel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "Egenskapsvärdet börjar eller slutar med blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Det finns en HTML-markör i egenskapsvärdet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXME-taggar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
 msgid "Check property keys."
 msgstr "Kontrollera egenskapsnycklar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Validera egenskapsnycklar genom att kontrollera mot en lista av ord."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
 msgid "Use complex property checker."
 msgstr "Använd komplicerad egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Validate property values and tags using complex rules."
 msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "TagChecker source"
 msgstr "Källa för TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10727,84 +11575,84 @@
 "taggkontrollera datafiler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Add a new source to the list."
 msgstr "Lägg till en ny källa till listan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Edit the selected source."
 msgstr "Redigera vald källa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 msgid "Data sources"
 msgstr "Datakällor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 msgid "Check property values."
 msgstr "Kontrollera egenskapsvärden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid "Check for FIXMES."
 msgstr "Leta efter FIXME-taggar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
 msgid "Check for paint notes."
 msgstr "Kontrollera om det finns ritningsanmärkningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check if map painting found data errors."
 msgstr "Kontrollera om problem uppstod vid ritning av kartan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
 msgid "Use default data file."
 msgstr "Använd förvald datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use the default data file (recommended)."
 msgstr "Använd den förvalda datafilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Use default spellcheck file."
 msgstr "Använd förvalda rättstavningsfil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839
 msgid "Fix properties"
 msgstr "Rätta till egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960
 msgid "Could not find element type"
 msgstr "Kunde inte hitta elementtyp"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
 msgid "Could not find warning level"
 msgstr "Kunde inte hitta varningsnivå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ogiltigt uttryck ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10949,7 +11797,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4090 build/trans_style.java:4097
-#: build/trans_style.java:4104 build/trans_style.java:4111
-#: build/trans_style.java:4118
+#: build/trans_style.java:4095 build/trans_style.java:4102
+#: build/trans_style.java:4109 build/trans_style.java:4116
+#: build/trans_style.java:4123
 msgid "building"
 msgstr "byggnad (building)"
@@ -10963,5 +11811,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4125
+#: build/trans_style.java:4130
 msgid "area"
 msgstr "yta (area)"
@@ -10997,10 +11845,10 @@
 msgstr "Slutnod på sträcka nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
 msgid "Untagged and unconnected nodes"
 msgstr "Noder som saknar tagg och inte ingår i en sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr ""
@@ -11060,8 +11908,32 @@
 msgstr "Felriktat land: land inte på vänster sida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74
 #, java-format
 msgid "{0}, ..."
 msgstr "{0}, ..."
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
+msgid "Scanned Map..."
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
+msgid ""
+"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
+msgid ""
+"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
+#, java-format
+msgid "Could not read information from walking-papers.org the id \"{0}\""
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
+#, java-format
+msgid "Walking Papers: {0}"
+msgstr ""
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -11072,10 +11944,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
 msgid "Reached a junction"
 msgstr ""
@@ -11124,14 +11996,14 @@
 msgstr "Hjälp om WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "Korrigerad bild..."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
 #, java-format
 msgid "WMS: {0}"
@@ -11142,26 +12014,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112
 msgid "Supported Rectifier Services:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
 msgid "Visit Homepage"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
 msgid "WMS URL or Image ID:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 msgid "Add Rectified Image"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -11169,5 +12041,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid "No valid WMS URL or id"
 msgstr ""
@@ -11177,5 +12049,5 @@
 msgstr "Justera valt WMS-lagers läge"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
 #, java-format
 msgid ""
@@ -11184,108 +12056,108 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "Menu Name"
 msgstr "Menynamn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "WMS URL"
 msgstr "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
 msgid "Enter a menu name and WMS URL"
 msgstr "Ange ett menynamn och en URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
 msgid "Copy Default"
 msgstr "Kopiera förval"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135
 msgid "Downloader:"
 msgstr ""
@@ -11394,11 +12266,16 @@
 msgstr ""
 
+#. Plugin graphview
+#: build/trans_plugins.java:23
+msgid "Visualizes routing information as a routing graph."
+msgstr ""
+
 #. Plugin grid
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -11408,10 +12285,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -11419,5 +12296,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -11427,5 +12304,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -11435,15 +12312,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -11451,5 +12328,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -11457,5 +12334,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -11464,15 +12341,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -11481,10 +12358,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -11493,15 +12370,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -11511,10 +12388,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11523,5 +12400,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11530,5 +12407,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11536,11 +12413,18 @@
 msgstr ""
 
+#. Plugin walkingpapers
+#: build/trans_plugins.java:71
+msgid ""
+"Supports downloading tiled, scanned maps from walking-papers.org. This "
+"plugin is still under early development and may be buggy."
+msgstr ""
+
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:75
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12695,58 +13579,6 @@
 
 #. item "Streets/Roundabout" combo "Type"
-#. color barrier
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="border_control"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="bump_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="portcullis"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="spikes"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="bus_trap"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="drawbridge"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="hampshire_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- highway tags -->
+#. color motorroad
+#. </rule>
 #.
 #. <rule>
@@ -12760,6 +13592,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:527
-#: build/trans_style.java:535
+#: build/trans_presets.java:346 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "motorway"
 msgstr "motorväg"
@@ -12785,6 +13617,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:543
-#: build/trans_style.java:551
+#: build/trans_presets.java:346 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "trunk"
 msgstr "stamväg"
@@ -12810,6 +13642,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:559
-#: build/trans_style.java:567
+#: build/trans_presets.java:346 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "primary"
 msgstr "primärväg"
@@ -12835,6 +13667,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:575
-#: build/trans_style.java:583
+#: build/trans_presets.java:346 build/trans_style.java:580
+#: build/trans_style.java:588
 msgid "secondary"
 msgstr "sekundärväg"
@@ -12848,5 +13680,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:591
+#: build/trans_presets.java:346 build/trans_style.java:596
 msgid "tertiary"
 msgstr "tertiärväg"
@@ -12864,5 +13696,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3106
+#: build/trans_presets.java:346 build/trans_style.java:3111
 msgid "residential"
 msgstr "bostadsgata"
@@ -12896,6 +13728,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:647
-#: build/trans_style.java:4183
+#: build/trans_presets.java:346 build/trans_style.java:652
+#: build/trans_style.java:4188
 msgid "service"
 msgstr "tillfartsväg"
@@ -12922,6 +13754,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:850
-#: build/trans_style.java:3171 build/trans_style.java:3172
+#: build/trans_presets.java:346 build/trans_style.java:855
+#: build/trans_style.java:3176 build/trans_style.java:3177
 msgid "construction"
 msgstr "under byggnad"
@@ -12971,5 +13803,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:868
+#: build/trans_presets.java:408 build/trans_style.java:873
 msgid "roundabout"
 msgstr "rondell"
@@ -13948,5 +14780,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3347
+#: build/trans_presets.java:1119 build/trans_style.java:3352
 msgid "marsh"
 msgstr "kärr"
@@ -15677,27 +16509,27 @@
 #: build/trans_presets.java:1800 build/trans_presets.java:1809
 #: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3527 build/trans_style.java:3535
-#: build/trans_style.java:3543 build/trans_style.java:3551
-#: build/trans_style.java:3559 build/trans_style.java:3567
-#: build/trans_style.java:3575 build/trans_style.java:3583
-#: build/trans_style.java:3591 build/trans_style.java:3599
-#: build/trans_style.java:3607 build/trans_style.java:3615
-#: build/trans_style.java:3623 build/trans_style.java:3631
-#: build/trans_style.java:3639 build/trans_style.java:3647
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3671 build/trans_style.java:3679
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3703 build/trans_style.java:3711
-#: build/trans_style.java:3719 build/trans_style.java:3727
-#: build/trans_style.java:3735 build/trans_style.java:3743
-#: build/trans_style.java:3751 build/trans_style.java:3759
-#: build/trans_style.java:3767 build/trans_style.java:3775
-#: build/trans_style.java:3783 build/trans_style.java:3791
-#: build/trans_style.java:3799 build/trans_style.java:3807
-#: build/trans_style.java:3815 build/trans_style.java:3823
-#: build/trans_style.java:3831 build/trans_style.java:3839
-#: build/trans_style.java:3847 build/trans_style.java:3855
-#: build/trans_style.java:3863 build/trans_style.java:3871
-#: build/trans_style.java:3879
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884
 msgid "sport"
 msgstr "sport"
@@ -16698,5 +17530,5 @@
 #: build/trans_presets.java:2900
 msgid "lutheran"
-msgstr "luteraner"
+msgstr "luteraner (inkl. Svenska kyrkan)"
 
 #: build/trans_presets.java:2170 build/trans_presets.java:2891
@@ -18536,7 +19368,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:663 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
-#: build/trans_style.java:903 build/trans_style.java:911
+#: build/trans_style.java:668 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
+#: build/trans_style.java:908 build/trans_style.java:916
 msgid "bicycle"
 msgstr "cykel"
@@ -18606,7 +19438,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:671 build/trans_style.java:679
-#: build/trans_style.java:687 build/trans_style.java:688
-#: build/trans_style.java:696
+#: build/trans_style.java:676 build/trans_style.java:684
+#: build/trans_style.java:692 build/trans_style.java:693
+#: build/trans_style.java:701
 msgid "foot"
 msgstr "fot"
@@ -18632,5 +19464,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1179
+#: build/trans_presets.java:3002 build/trans_style.java:1184
 msgid "subway"
 msgstr "tunnelbana"
@@ -19121,13 +19953,13 @@
 #: build/trans_style.java:130 build/trans_style.java:165
 #: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:607 build/trans_style.java:804
-#: build/trans_style.java:1129 build/trans_style.java:2386
-#: build/trans_style.java:3338 build/trans_style.java:3339
-#: build/trans_style.java:3893 build/trans_style.java:4193
-#: build/trans_style.java:4202 build/trans_style.java:4211
-#: build/trans_style.java:4220 build/trans_style.java:4229
-#: build/trans_style.java:4238 build/trans_style.java:4247
-#: build/trans_style.java:4248 build/trans_style.java:4257
-#: build/trans_style.java:4266
+#: build/trans_style.java:612 build/trans_style.java:809
+#: build/trans_style.java:1134 build/trans_style.java:2391
+#: build/trans_style.java:3343 build/trans_style.java:3344
+#: build/trans_style.java:3898 build/trans_style.java:4198
+#: build/trans_style.java:4207 build/trans_style.java:4216
+#: build/trans_style.java:4225 build/trans_style.java:4234
+#: build/trans_style.java:4243 build/trans_style.java:4252
+#: build/trans_style.java:4253 build/trans_style.java:4262
+#: build/trans_style.java:4271
 msgid "deprecated"
 msgstr "förlegad"
@@ -19169,5 +20001,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:655
+#: build/trans_style.java:266 build/trans_style.java:660
 msgid "horse"
 msgstr "häst"
@@ -19387,4 +20219,66 @@
 msgstr ""
 
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bump_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="sally_port"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="portcullis"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="spikes"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bus_trap"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway tags -->
+#.
+#. <rule>
+#. <condition k="motorroad" v="yes"/>
+#: build/trans_style.java:527
+#, fuzzy
+msgid "motorroad"
+msgstr "motorsport"
+
 #. color tertiary
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19419,6 +20313,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:599 build/trans_style.java:615
-#: build/trans_style.java:631 build/trans_style.java:639
+#: build/trans_style.java:604 build/trans_style.java:620
+#: build/trans_style.java:636 build/trans_style.java:644
 msgid "street"
 msgstr "gata"
@@ -19474,7 +20368,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:623 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
-#: build/trans_style.java:945 build/trans_style.java:953
+#: build/trans_style.java:628 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -19530,8 +20424,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:704 build/trans_style.java:1153
-#: build/trans_style.java:1217 build/trans_style.java:1225
-#: build/trans_style.java:1234 build/trans_style.java:1242
-#: build/trans_style.java:1243
+#: build/trans_style.java:709 build/trans_style.java:1158
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1239 build/trans_style.java:1247
+#: build/trans_style.java:1248
 msgid "rail"
 msgstr "räls"
@@ -19552,5 +20446,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:819
+#: build/trans_style.java:824
 msgid "services"
 msgstr ""
@@ -19564,5 +20458,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:827
+#: build/trans_style.java:832
 msgid "ford"
 msgstr ""
@@ -19583,5 +20477,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:847
 msgid "turningcircle"
 msgstr "vändplats"
@@ -19596,5 +20490,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:859
+#: build/trans_style.java:864
 msgid "emergency_access_point"
 msgstr ""
@@ -19609,5 +20503,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:971 build/trans_style.java:972
+#: build/trans_style.java:976 build/trans_style.java:977
 msgid "riverbank"
 msgstr "flodbank"
@@ -19621,5 +20515,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "stream"
 msgstr "bäck"
@@ -19633,5 +20527,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1004
+#: build/trans_style.java:1009
 msgid "dock"
 msgstr "hamn"
@@ -19659,5 +20553,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1026
+#: build/trans_style.java:1031
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -19825,13 +20719,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1035 build/trans_style.java:1064
-#: build/trans_style.java:1072 build/trans_style.java:1073
-#: build/trans_style.java:1081 build/trans_style.java:1521
-#: build/trans_style.java:1528 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1601
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626 build/trans_style.java:1634
+#: build/trans_style.java:1040 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1078
+#: build/trans_style.java:1086 build/trans_style.java:1526
+#: build/trans_style.java:1533 build/trans_style.java:1542
+#: build/trans_style.java:1550 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1591
+#: build/trans_style.java:1599 build/trans_style.java:1606
+#: build/trans_style.java:1615 build/trans_style.java:1623
+#: build/trans_style.java:1631 build/trans_style.java:1639
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -19893,7 +20787,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1091 build/trans_style.java:1106
-#: build/trans_style.java:1121 build/trans_style.java:1137
-#: build/trans_style.java:1145
+#: build/trans_style.java:1096 build/trans_style.java:1111
+#: build/trans_style.java:1126 build/trans_style.java:1142
+#: build/trans_style.java:1150
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -19916,10 +20810,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1162 build/trans_style.java:1171
+#: build/trans_style.java:1167 build/trans_style.java:1176
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1163
+#: build/trans_style.java:1168
 msgid "railover"
 msgstr ""
@@ -19955,7 +20849,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1187 build/trans_style.java:1197
-#: build/trans_style.java:1198 build/trans_style.java:1208
-#: build/trans_style.java:1209
+#: build/trans_style.java:1192 build/trans_style.java:1202
+#: build/trans_style.java:1203 build/trans_style.java:1213
+#: build/trans_style.java:1214
 msgid "oldrail"
 msgstr ""
@@ -20000,6 +20894,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1273 build/trans_style.java:1274
-#: build/trans_style.java:1306
+#: build/trans_style.java:1278 build/trans_style.java:1279
+#: build/trans_style.java:1311
 msgid "aeroway"
 msgstr ""
@@ -20013,5 +20907,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1282
+#: build/trans_style.java:1287
 msgid "terminal"
 msgstr "terminal"
@@ -20033,5 +20927,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1290 build/trans_style.java:1298
+#: build/trans_style.java:1295 build/trans_style.java:1303
 msgid "aeroway_dark"
 msgstr ""
@@ -20045,5 +20939,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1314
+#: build/trans_style.java:1319
 msgid "aeroway_light"
 msgstr ""
@@ -20091,7 +20985,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1324 build/trans_style.java:1332
-#: build/trans_style.java:1340 build/trans_style.java:1348
-#: build/trans_style.java:1356
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345 build/trans_style.java:1353
+#: build/trans_style.java:1361
 msgid "aerialway"
 msgstr "linbana"
@@ -20108,5 +21002,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1366 build/trans_style.java:1367
+#: build/trans_style.java:1371 build/trans_style.java:1372
 msgid "piste_easy"
 msgstr ""
@@ -20121,5 +21015,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1375 build/trans_style.java:1376
+#: build/trans_style.java:1380 build/trans_style.java:1381
 msgid "piste_intermediate"
 msgstr ""
@@ -20134,5 +21028,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1384 build/trans_style.java:1385
+#: build/trans_style.java:1389 build/trans_style.java:1390
 msgid "piste_advanced"
 msgstr ""
@@ -20147,5 +21041,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1393 build/trans_style.java:1394
+#: build/trans_style.java:1398 build/trans_style.java:1399
 msgid "piste_expert"
 msgstr ""
@@ -20160,5 +21054,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1402 build/trans_style.java:1403
+#: build/trans_style.java:1407 build/trans_style.java:1408
 msgid "piste_freeride"
 msgstr ""
@@ -20173,5 +21067,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1411 build/trans_style.java:1412
+#: build/trans_style.java:1416 build/trans_style.java:1417
 msgid "piste_novice"
 msgstr ""
@@ -20276,10 +21170,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1423 build/trans_style.java:1430
-#: build/trans_style.java:1439 build/trans_style.java:1447
-#: build/trans_style.java:1455 build/trans_style.java:1463
-#: build/trans_style.java:1471 build/trans_style.java:1479
-#: build/trans_style.java:1487 build/trans_style.java:1495
-#: build/trans_style.java:1503 build/trans_style.java:1511
+#: build/trans_style.java:1428 build/trans_style.java:1435
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
+#: build/trans_style.java:1508 build/trans_style.java:1516
 msgid "power"
 msgstr "kraft"
@@ -20293,5 +21187,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1552 build/trans_style.java:1553
+#: build/trans_style.java:1557 build/trans_style.java:1558
 msgid "pier"
 msgstr "pir"
@@ -20305,5 +21199,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1561
+#: build/trans_style.java:1566
 msgid "pipeline"
 msgstr "rörledning"
@@ -20431,12 +21325,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1676 build/trans_style.java:1684
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1732 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1681 build/trans_style.java:1689
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769
 msgid "leisure"
 msgstr "fritid"
@@ -20450,5 +21344,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1692
+#: build/trans_style.java:1697
 msgid "marina"
 msgstr "marina"
@@ -20520,8 +21414,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1774 build/trans_style.java:1782
-#: build/trans_style.java:1790 build/trans_style.java:1798
-#: build/trans_style.java:1806 build/trans_style.java:1814
-#: build/trans_style.java:1822 build/trans_style.java:1830
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
+#: build/trans_style.java:1827 build/trans_style.java:1835
 msgid "amenity"
 msgstr "inrättning"
@@ -20623,10 +21517,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1909
-#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1899
+#: build/trans_style.java:1907 build/trans_style.java:1914
+#: build/trans_style.java:1923 build/trans_style.java:1931
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -21012,22 +21906,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1934 build/trans_style.java:1942
-#: build/trans_style.java:1950 build/trans_style.java:1958
-#: build/trans_style.java:1966 build/trans_style.java:1974
-#: build/trans_style.java:1982 build/trans_style.java:1990
-#: build/trans_style.java:2105 build/trans_style.java:2113
-#: build/trans_style.java:2120 build/trans_style.java:2129
-#: build/trans_style.java:2137 build/trans_style.java:2145
-#: build/trans_style.java:2153 build/trans_style.java:2161
-#: build/trans_style.java:2169 build/trans_style.java:2177
-#: build/trans_style.java:2240 build/trans_style.java:2248
-#: build/trans_style.java:2256 build/trans_style.java:2265
-#: build/trans_style.java:2273 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2369 build/trans_style.java:2377
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:2110 build/trans_style.java:2118
+#: build/trans_style.java:2125 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2174 build/trans_style.java:2182
+#: build/trans_style.java:2245 build/trans_style.java:2253
+#: build/trans_style.java:2261 build/trans_style.java:2270
+#: build/trans_style.java:2278 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2365
+#: build/trans_style.java:2374 build/trans_style.java:2382
 msgid "amenity_light"
 msgstr ""
@@ -21059,6 +21953,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1998 build/trans_style.java:2006
-#: build/trans_style.java:3257
+#: build/trans_style.java:2003 build/trans_style.java:2011
+#: build/trans_style.java:3262
 msgid "light_water"
 msgstr ""
@@ -21119,8 +22013,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2184 build/trans_style.java:2192
-#: build/trans_style.java:2200 build/trans_style.java:2209
-#: build/trans_style.java:2216 build/trans_style.java:2224
-#: build/trans_style.java:2232
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:2205 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2229
+#: build/trans_style.java:2237
 msgid "health"
 msgstr "hälsa"
@@ -21473,26 +22367,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2396 build/trans_style.java:2404
-#: build/trans_style.java:2412 build/trans_style.java:2420
-#: build/trans_style.java:2428 build/trans_style.java:2436
-#: build/trans_style.java:2444 build/trans_style.java:2452
-#: build/trans_style.java:2460 build/trans_style.java:2468
-#: build/trans_style.java:2476 build/trans_style.java:2484
-#: build/trans_style.java:2492 build/trans_style.java:2500
-#: build/trans_style.java:2508 build/trans_style.java:2516
-#: build/trans_style.java:2524 build/trans_style.java:2532
-#: build/trans_style.java:2540 build/trans_style.java:2548
-#: build/trans_style.java:2556 build/trans_style.java:2564
-#: build/trans_style.java:2572 build/trans_style.java:2580
-#: build/trans_style.java:2588 build/trans_style.java:2596
-#: build/trans_style.java:2604 build/trans_style.java:2612
-#: build/trans_style.java:2620 build/trans_style.java:2628
-#: build/trans_style.java:2636 build/trans_style.java:2644
-#: build/trans_style.java:2652 build/trans_style.java:2660
-#: build/trans_style.java:2668 build/trans_style.java:2676
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2733
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2721 build/trans_style.java:2729
+#: build/trans_style.java:2738
 msgid "shop"
 msgstr "affär"
@@ -21564,8 +22458,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2743 build/trans_style.java:2751
-#: build/trans_style.java:2759 build/trans_style.java:2767
-#: build/trans_style.java:2775 build/trans_style.java:2783
-#: build/trans_style.java:2791 build/trans_style.java:2799
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
+#: build/trans_style.java:2796 build/trans_style.java:2804
 msgid "hotel"
 msgstr "hotell"
@@ -21715,9 +22609,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2807 build/trans_style.java:2815
-#: build/trans_style.java:2823 build/trans_style.java:2831
-#: build/trans_style.java:2839 build/trans_style.java:2847
-#: build/trans_style.java:2848 build/trans_style.java:2856
-#: build/trans_style.java:2872 build/trans_style.java:2943
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2844 build/trans_style.java:2852
+#: build/trans_style.java:2853 build/trans_style.java:2861
+#: build/trans_style.java:2877 build/trans_style.java:2948
 msgid "tourism"
 msgstr "turism"
@@ -21789,8 +22683,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2953 build/trans_style.java:2961
-#: build/trans_style.java:2969 build/trans_style.java:2977
-#: build/trans_style.java:2985 build/trans_style.java:2993
-#: build/trans_style.java:3001 build/trans_style.java:3009
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
 msgid "historic"
 msgstr "historisk"
@@ -21861,8 +22755,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3018 build/trans_style.java:3026
-#: build/trans_style.java:3034 build/trans_style.java:3042
-#: build/trans_style.java:3090 build/trans_style.java:3098
-#: build/trans_style.java:3196 build/trans_style.java:3204
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3095 build/trans_style.java:3103
+#: build/trans_style.java:3201 build/trans_style.java:3209
 msgid "green"
 msgstr ""
@@ -21876,5 +22770,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3050
+#: build/trans_style.java:3055
 msgid "quarry"
 msgstr "stenbrott"
@@ -21888,5 +22782,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3058
+#: build/trans_style.java:3063
 msgid "landfill"
 msgstr ""
@@ -21908,5 +22802,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3066 build/trans_style.java:3074
+#: build/trans_style.java:3071 build/trans_style.java:3079
 msgid "basin"
 msgstr "hamnbassäng"
@@ -21920,5 +22814,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3082
+#: build/trans_style.java:3087
 msgid "forest"
 msgstr "skog"
@@ -21932,7 +22826,7 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3114
+#: build/trans_style.java:3119
 msgid "farmyard"
-msgstr ""
+msgstr "gårdsplan"
 
 #. color farmyard
@@ -21953,5 +22847,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3123 build/trans_style.java:3131
+#: build/trans_style.java:3128 build/trans_style.java:3136
 msgid "retail"
 msgstr "detaljhandel"
@@ -21965,5 +22859,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3139
+#: build/trans_style.java:3144
 msgid "industrial"
 msgstr "industri"
@@ -21977,5 +22871,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3147
+#: build/trans_style.java:3152
 msgid "brownfield"
 msgstr ""
@@ -21989,5 +22883,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3155
+#: build/trans_style.java:3160
 msgid "greenfield"
 msgstr ""
@@ -22001,5 +22895,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3163
+#: build/trans_style.java:3168
 msgid "railland"
 msgstr ""
@@ -22056,7 +22950,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3180 build/trans_style.java:3215
-#: build/trans_style.java:3223 build/trans_style.java:3231
-#: build/trans_style.java:3239 build/trans_style.java:3247
+#: build/trans_style.java:3185 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
+#: build/trans_style.java:3244 build/trans_style.java:3252
 msgid "military"
 msgstr "militär"
@@ -22070,5 +22964,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3188
+#: build/trans_style.java:3193
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -22081,5 +22975,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3264
+#: build/trans_style.java:3269
 msgid "peak"
 msgstr "topp"
@@ -22094,5 +22988,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3273
+#: build/trans_style.java:3278
 msgid "glacier"
 msgstr "glaciär"
@@ -22106,5 +23000,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3281
+#: build/trans_style.java:3286
 msgid "volcano"
 msgstr "vulkan"
@@ -22159,8 +23053,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3289 build/trans_style.java:3290
-#: build/trans_style.java:3298 build/trans_style.java:3314
-#: build/trans_style.java:3387 build/trans_style.java:3395
-#: build/trans_style.java:3403
+#: build/trans_style.java:3294 build/trans_style.java:3295
+#: build/trans_style.java:3303 build/trans_style.java:3319
+#: build/trans_style.java:3392 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "natural"
 msgstr "naturfenomen"
@@ -22174,5 +23068,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3306
+#: build/trans_style.java:3311
 msgid "scrub"
 msgstr "buskage"
@@ -22186,5 +23080,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3322
+#: build/trans_style.java:3327
 msgid "heath"
 msgstr "hed"
@@ -22198,5 +23092,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3330
+#: build/trans_style.java:3335
 msgid "wood"
 msgstr "skog"
@@ -22210,5 +23104,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3371
+#: build/trans_style.java:3376
 msgid "mud"
 msgstr "lera"
@@ -22222,5 +23116,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3379
+#: build/trans_style.java:3384
 msgid "beach"
 msgstr "strand"
@@ -22298,8 +23192,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3419 build/trans_style.java:3427
-#: build/trans_style.java:3435 build/trans_style.java:3443
-#: build/trans_style.java:3451 build/trans_style.java:3459
-#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
+#: build/trans_style.java:3472 build/trans_style.java:3480
 msgid "route"
 msgstr "rutt"
@@ -22347,7 +23241,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3485 build/trans_style.java:3493
-#: build/trans_style.java:3501 build/trans_style.java:3509
-#: build/trans_style.java:3517
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522
 msgid "boundary"
 msgstr "gräns"
@@ -22489,10 +23383,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3941 build/trans_style.java:3949
-#: build/trans_style.java:3957 build/trans_style.java:3965
-#: build/trans_style.java:3973 build/trans_style.java:3981
-#: build/trans_style.java:3989 build/trans_style.java:3997
-#: build/trans_style.java:4005 build/trans_style.java:4013
-#: build/trans_style.java:4021 build/trans_style.java:4029
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
 msgid "place"
 msgstr "plats"
@@ -22540,6 +23434,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4146 build/trans_style.java:4153
-#: build/trans_style.java:4160 build/trans_style.java:4167
+#: build/trans_style.java:4151 build/trans_style.java:4158
+#: build/trans_style.java:4165 build/trans_style.java:4172
 msgid "address"
 msgstr "adress"
@@ -22836,24 +23730,86 @@
 msgstr ""
 
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "Uploading data"
-#~ msgstr "Skickar data"
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Misslyckades att initialisera API."
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller "
+#~ "laddat ner ett datalager?"
+
+#~ msgid "No data"
+#~ msgstr "Inga data"
+
+#~ msgid "Update failed"
+#~ msgstr "Uppdatering misslyckades"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Primitiv saknas"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Lager: {0}"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
+#~ "JOSM från."
+
+#~ msgid "Validate"
+#~ msgstr "Validera"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Avbryter..."
 
 #~ msgid "Not implemented yet."
 #~ msgstr "Inte implementerat ännu."
 
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Jämka konflikter"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Konflikter upptäcktes under import."
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
+#~ msgid "Change"
+#~ msgstr "Ändra"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotera"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Jämka {0} konflikter i {1} objekt"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "olik"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sann"
+
+#~ msgid "their version:"
+#~ msgstr "deras version:"
 
 #~ msgid "{0} object has conflicts:"
@@ -22865,45 +23821,88 @@
 #~ msgstr "min version:"
 
-#~ msgid "their version:"
-#~ msgstr "deras version:"
-
 #~ msgid "resolved version:"
 #~ msgstr "jämkad version:"
 
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Jämka konflikter"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Taggar (tomt värde tar bort taggen)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Innehas av"
+
+#~ msgid "Add Selected"
+#~ msgstr "Lägg till vald"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan inte ansluta till server."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Fel vid inläsning av serverns svar."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Konflikter upptäcktes under import."
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Ansluter till OSM-servern"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Användarnamn (epost) för OSM-kontot"
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Unknown host"
-#~ msgstr "Okänd värddator"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Jämka {0} konflikter i {1} objekt"
-
-#~ msgid "Change"
-#~ msgstr "Ändra"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klicka på Uppdatera för att uppdatera listan"
-
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Källor för snabbval för taggning"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Källa till snabbval för taggning"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Justera WMS-lagrets position"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "image not loaded"
+#~ msgstr "bilden har inte hämtats"
+
+#~ msgid ""
+#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+#~ "move mouse.   Select: Click."
+#~ msgstr ""
+#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger "
+#~ "musknapp och flytta musen. Välj: Klicka"
+
+#~ msgid "Commit comment"
+#~ msgstr "Bidragskommentar"
+
+#~ msgid "Charge"
+#~ msgstr "Avgift"
 
 #~ msgid ""
@@ -22914,114 +23913,18 @@
 #~ "historiklistan."
 
-#~ msgid "Rotate"
-#~ msgstr "Rotera"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fel vid inläsning av serverns svar."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan inte ansluta till server."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
-#~ "panorera."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Källa till snabbval för taggning"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Källor för snabbval för taggning"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
-#~ "försök igen efter en stund."
-
-#~ msgid "Commit comment"
-#~ msgstr "Bidragskommentar"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM."
-#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "image not loaded"
-#~ msgstr "bilden har inte hämtats"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger "
-#~ "musknapp och flytta musen. Välj: Klicka"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id för Metacartas korrigerade kartbild"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "korrigeringsid={0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Justera WMS-lagrets position"
-
-#~ msgid "Charge"
-#~ msgstr "Avgift"
-
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
 
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Servern har inte stöd för ändringssamlingar"
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
 
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}"
 
 #~ msgid "Plugin already exists"
 #~ msgstr "Insticksmodulen finns redan"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Några av noderna befinner sig (nästan) på linje"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Klaffbro"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Really mark this issue as ''done''?"
@@ -23029,9 +23932,24 @@
 #~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
 
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importera TCX-fil som GPS-spår"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "Importera TCX-fil..."
 
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importera TCX-fil som GPS-spår"
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Id för Metacartas korrigerade kartbild"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "korrigeringsid={0}"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Klaffbro"
 
 #~ msgid ""
@@ -23108,4 +24026,19 @@
 #~ msgstr "Fällgaller"
 
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM."
+#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
+#~ "försök igen efter en stund."
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -23113,4 +24046,100 @@
 #~ msgstr ""
 #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt."
+
+#~ msgid ""
+#~ "Plugin archive already available. Do you want to download the current "
+#~ "version by deleting existing archive?\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "Arkivfil för insticksmodul finns redan tillgänglig. Önskar du hämta "
+#~ "nuvarande version genom att ta bort det existerande arkivet?\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikter: {0}"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klicka på Uppdatera för att uppdatera listan"
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt"
+
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Några av noderna befinner sig (nästan) på linje"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
+#~ "panorera."
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr ""
+#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: "
+#~ "{0}\n"
+
+#~ msgid "Basic"
+#~ msgstr "Grundläggande"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Ta bort det valda"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Servern har inte stöd för ändringssamlingar"
+
+#~ msgid "Delete and Download"
+#~ msgstr "Ta bort och hämta hem"
+
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
+
+#~ msgid "sports"
+#~ msgstr "Sportaffär"
+
+#~ msgid "Move Down"
+#~ msgstr "Flytta nedåt"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Relationsredigerare:{0}"
+
+#~ msgid "Move Up"
+#~ msgstr "Flytta uppåt"
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan "
+#~ "skickats in har en historik."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
+#~ "fortsätta?"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Redigera en klaffbro"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Redigera ett fällgaller"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Följande fel uppstod vid massnedladdning:"
+
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
+
+#~ msgid "Start routing"
+#~ msgstr "Påbörja ruttberäkning"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Ta bort ruttnoder"
 
 #~ msgid ""
@@ -23127,63 +24156,4 @@
 #~ "Skicka inte in några data efter du har fått detta meddelande."
 
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Arkivfil för insticksmodul finns redan tillgänglig. Önskar du hämta "
-#~ "nuvarande version genom att ta bort det existerande arkivet?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikter: {0}"
-
-#~ msgid "viaduct"
-#~ msgstr "viadukt"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning"
-
-#~ msgid "sports"
-#~ msgstr "Sportaffär"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Ta bort och hämta hem"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Jämka konflikt"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan "
-#~ "skickats in har en historik."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
-#~ "fortsätta?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Följande fel uppstod vid massnedladdning:"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Redigera en klaffbro"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Redigera ett fällgaller"
-
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
 #~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
@@ -23196,10 +24166,4 @@
 #~ "\"{1}\">ditt språk</A>."
 
-#~ msgid "Remove route nodes"
-#~ msgstr "Ta bort ruttnoder"
-
-#~ msgid "Start routing"
-#~ msgstr "Påbörja ruttberäkning"
-
 #~ msgid "Undeleting Way..."
 #~ msgstr "Ångrar radering av väg..."
@@ -23211,12 +24175,9 @@
 #~ msgstr "Återskapar relation..."
 
+#~ msgid "Keep mine"
+#~ msgstr "Behåll mina"
+
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Behåll mina"
-
-#~ msgid "Delete mine"
-#~ msgstr "Radera mina"
 
 #~ msgid ""
@@ -23235,4 +24196,7 @@
 #~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
 
+#~ msgid "Delete mine"
+#~ msgstr "Radera mina"
+
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
