Changeset 26037 in osm for applications/editors/josm/i18n/po/en_AU.po

Timestamp:

2011-05-23T00:05:05+02:00 (14 years ago)

Author:

bastik

Message:

i18n update

File:

• applications/editors/josm/i18n/po/en_AU.po (modified) (186 diffs)

applications/editors/josm/i18n/po/en_AU.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-23 22:56+0200\n"
+"POT-Creation-Date: 2011-05-22 23:30+0200\n"
 "PO-Revision-Date: 2010-11-27 03:23+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-04-23 20:53+0000\n"
-"X-Generator: Launchpad (build 12883)\n"
+"X-Launchpad-Export-Date: 2011-05-22 19:45+0000\n"
+"X-Generator: Launchpad (build 13085)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -26 +25 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:359
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -70 +69 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:317
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
@@ -78 +77 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
@@ -89 +88 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:133
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:210
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -141 +141 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:333
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:376
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -157 +157 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:953
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:842
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:568
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -171 +171 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:221
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117
@@ -241 +241 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:818
@@ -280 +280 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:32
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:542
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -353 +353 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:224
@@ -366 +366 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:226
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -377 +377 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:961
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -400 +400 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:665
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1406
@@ -412 +412 @@
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
@@ -424 +425 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:195
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:196
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:194
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:189
@@ -535 +533 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
@@ -552 +551 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:38
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java:32
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:82
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:22
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:44
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
@@ -569 +570 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
-#: ../plugins/terracer/src/terracer/TerracerAction.java:73
+#: ../plugins/terracer/src/terracer/TerracerAction.java:71
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:45
@@ -585 +586 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:26
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:26
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:29
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:29
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:33
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:28
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java:25
 #, java-format
@@ -604 +608 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
@@ -618 +622 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1021
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:40
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:44
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 msgid "Information"
@@ -718 +722 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
@@ -860 +864 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
@@ -920 +924 @@
 msgstr "Download map data from the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
 msgid "Download object..."
 msgstr "Download object..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:53
 msgid "Download OSM object by ID."
 msgstr "Download OSM object by ID."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:66
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83
+msgid "Object type:"
+msgstr "Object type:"
+
+#. item "Nature/Wood" combo "Type" display value
+#. item "Nature/Forest" combo "Type" display value
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:68
+#: build/trans_presets.java:3835 build/trans_presets.java:3844
+msgid "mixed"
+msgstr "mixed"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:69
+msgid "Choose the OSM object type"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91
+msgid "Object ID:"
+msgstr "Object ID:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:72
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Enter the ID of the object that should be downloaded"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:74
@@ -935 +964 @@
 msgstr "Separate Layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:71
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Select if the data should be downloaded into a new layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
 #: ../plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java:31
 msgid "Download referrers"
 msgstr "Download referrers"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
 msgid "Select if the referrers of the object should be downloaded as well"
 msgstr "Select if the referrers of the object should be downloaded as well"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83
-msgid "Object type:"
-msgstr "Object type:"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58
-msgid "Choose the OSM object type"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91
-msgid "Object ID:"
-msgstr "Object ID:"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Enter the ID of the object that should be downloaded"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Download object"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:120
 msgid "Start downloading"
 msgstr "Start downloading"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:121
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:96
 msgid "Close dialog and cancel downloading"
 msgstr "Close dialogue and cancel downloading"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
-msgid "Invalid ID specified. Cannot download object."
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:136
+msgid ""
+"Invalid ID list specified\n"
+" Cannot download object."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:170
+#, fuzzy
+msgid "Object could not be downloaded"
+msgid_plural "Some objects could not be downloaded"
+msgstr[0] "File could not be deleted!"
+msgstr[1] "File could not be deleted!"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:171
+#, fuzzy, java-format
+msgid "One object could not be downloaded.<br>"
+msgid_plural "{0} objects could not be downloaded.<br>"
+msgstr[0] "Image file could not be deleted."
+msgstr[1] "Image file could not be deleted."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:175
+msgid ""
+"The server replied with response code 404.<br>This usually means, the server "
+"does not know an object with the requested id."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:177
+msgid "missing objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:202
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
+#, fuzzy
+msgid "Object deleted"
+msgid_plural "Objects deleted"
+msgstr[0] "Object deleted"
+msgstr[1] "Object deleted"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:204
+#, java-format
+msgid "One downloaded object is deleted."
+msgid_plural "{0} downloaded objects are deleted."
+msgstr[0] ""
+msgstr[1] ""
+
+#. content.add(scroller);
+#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
+msgid "Ok"
 msgstr ""
 
@@ -1047 +1114 @@
 msgstr "Exit the application."
 
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:36
+msgid "Follow line"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:38
+msgid "Continues drawing a line that shares nodes with another line."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
+#, fuzzy
+msgid "Follow"
+msgstr "low"
+
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:35
 msgid "Fullscreen view"
@@ -1106 +1186 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1290
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
@@ -1124 +1204 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:131
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:170
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:98
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:300
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
 #: build/specialmessages.java:69
@@ -1877 +1956 @@
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1403
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408
 #: build/specialmessages.java:76
 msgid "Save"
@@ -1992 +2071 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1379
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1384
 msgid "Close"
 msgstr "Close"
@@ -2015 +2094 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:259
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
 msgid "No, abort"
@@ -2043 +2122 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -2431 +2510 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:99
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:97
 msgid "Wireframe View"
 msgstr "Wireframe View"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:20
 msgid "Enable/disable rendering the map as wireframe only"
 msgstr "Enable/disable rendering the map as wireframe only"
 
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:21
 msgid "Toggle Wireframe view"
 msgstr "Toggle Wireframe view"
@@ -2684 +2763 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:105
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
@@ -2738 +2818 @@
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914
 #, java-format
 msgid "Insert new node into way."
@@ -2754 +2834 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:926
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2818 +2898 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
@@ -3085 +3166 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid ""
-"<b>timestamp:</b>... -  objects with this timestamp "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>timestamp:</b>... -  objects with this timestamp "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr ""
+"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid ""
+"<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
+"(areasize:MIN-MAX or areasize:MAX)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - all changed objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - all selected objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - all incomplete objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - all untagged objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -3113 +3204 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -3119 +3210 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -3135 +3226 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Use <b>(</b> and <b>)</b> to group expressions"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
@@ -3150 +3241 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "Submit filter"
 msgstr "Submit filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "Start Search"
 msgstr "Start Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 #, java-format
 msgid ""
@@ -3171 +3262 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
 msgid "Invalid search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No match found for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nothing added to selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nothing removed from selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nothing found in selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:428
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:430
 #, java-format
 msgid "Found {0} matches"
@@ -3201 +3292 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:461
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:463
 msgctxt "search"
 msgid "CS"
@@ -3207 +3298 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
 msgctxt "search"
 msgid "CI"
@@ -3213 +3304 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
 msgctxt "search"
 msgid "RX"
@@ -3219 +3310 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:468
 msgctxt "search"
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
 #, java-format
 msgid ""
@@ -3235 +3326 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:52
 #, java-format
 msgid ""
@@ -3243 +3334 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:264
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:450
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:638
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:665
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unexpected token. Expected {0}, found {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:680
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:664
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
 msgid "Missing parameter for OR"
 msgstr "Missing parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
 msgid "Missing operator for NOT"
 msgstr "Missing operator for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:696
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:723
 msgid "Primitive id expected"
 msgstr "Primitive id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:698
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:725
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:728
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
 msgid "Range of numbers expected"
 msgstr "Range of numbers expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:734
 msgid "Changeset id expected"
 msgstr "Changeset id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:706
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:736
 msgid "Version expected"
 msgstr "Version expected"
@@ -3354 +3446 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:120
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:569
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:567
 msgid "Errors"
 msgstr "Errors"
@@ -4030 +4122 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:317
 #, java-format
 msgid ""
@@ -4037 +4129 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:725
 #, java-format
 msgid ""
@@ -4130 +4222 @@
 msgstr "A primitive with ID = 0 cannot be invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1393
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1416
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -4138 +4230 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1395
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1418
 #, java-format
 msgid ""
@@ -4147 +4239 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
 msgid "node"
 msgid_plural "nodes"
@@ -4166 +4258 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:229
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:429
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:345
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:532
 msgid "relation"
 msgid_plural "relations"
@@ -4208 +4300 @@
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parameter {0} not in range 0..{1}, got {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:108
+#, java-format
+msgid ""
+"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:144
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:149
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:155
+msgid "Activating the standard map renderer instead."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:148
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:154
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
+"map renderer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:166
+#, fuzzy
+msgid "Wireframe Map Renderer"
+msgstr "Wireframe View"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:167
+msgid "Renders the map as simple wire frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:171
+msgid "Styled Map Renderer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:172
+msgid "Renders the map using style rules in a set of style sheets."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -4248 +4389 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "background"
@@ -4435 +4576 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
 msgid "validation error"
 msgstr "validation error"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:16
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
 msgid "validation warning"
 msgstr "validation warning"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
 msgid "validation other"
 msgstr "validation other"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Test.java:100
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Check.java:92
 #, java-format
 msgid "Running test {0}"
@@ -4949 +5094 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1016
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:731
@@ -4955 +5100 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:308
 msgid "Add"
 msgstr "Add"
@@ -4968 +5112 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:483
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:802
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1054
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:804
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1056
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:272
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
@@ -5235 +5379 @@
 #. color building
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:221
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:335
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: build/trans_style.java:3568
@@ -5382 +5526 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:84
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:346
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:448
 #, java-format
 msgid " [id: {0}]"
@@ -5420 +5564 @@
 msgstr "Do not show again (remembers choice)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:278
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:238
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:253
 msgid "incomplete"
 msgstr "incomplete"
 
 #. I18n: name of house as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:171
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184
 #, java-format
 msgid "House {0}"
@@ -5436 +5580 @@
 #. I18n: house number, street as parameter, number should remain
 #. before street for better visibility
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:191
 #, java-format
 msgid "House number {0} at {1}"
@@ -5443 +5587 @@
 
 #. I18n: house number as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:126
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:182
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:195
 #, java-format
 msgid "House number {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:400
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:502
 msgid "highway"
 msgstr "highway"
 
 #. item "Relations/Route" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:401
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:175
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:503
 #: build/trans_presets.java:4138
 msgid "railway"
 msgstr "railway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:402
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:176
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:504
 msgid "waterway"
 msgstr "waterway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:403
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:177
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:505
 msgid "landuse"
 msgstr "landuse"
@@ -5474 +5618 @@
 #. nevertheless, who knows what future brings
 #. I18n: count of nodes as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:196
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:408
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:210
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:510
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:266
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} node"
@@ -5486 +5630 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-msgid "public transport"
-msgstr "public transport"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:268
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:457
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:250
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 #, java-format
 msgid "{0} member"
@@ -5498 +5638 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:294
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:330
+msgid "public transport"
+msgstr "public transport"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:396
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5567 +5711 @@
 msgstr "Unknown host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
-msgid "Object deleted"
-msgstr "Object deleted"
-
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:111
@@ -5595 +5735 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 msgid "Imagery"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:117
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:94
 msgid "Blank Layer"
@@ -5695 +5835 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5771 +5911 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -5783 +5923 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:193
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:218
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:234
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:263
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:250
 msgid "Discard"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:267
 #, java-format
 msgid "JOSM found {0} unsaved osm data layer. "
@@ -5835 +5975 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:259
-msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:269
+msgid ""
+"It looks like JOSM crashed last time. Would you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:306
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -5850 +5991 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: build/specialmessages.java:87
 msgid "View"
 msgstr "View"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
@@ -5861 +6002 @@
 msgstr "Tools"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -5867 +6008 @@
 msgstr "Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -5876 +6017 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:346
 msgid "Audio"
 msgstr "Audio"
@@ -5985 +6126 @@
 msgstr "Layer ''{0}'' must be in list of layers"
 
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1211
+msgid "Metric"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1212
-msgid "Metric"
+msgid "Chinese"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1213
-msgid "Chinese"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1214
 msgid "Imperial"
 msgstr ""
@@ -6074 +6215 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6436 +6577 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:465
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:781
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1035
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:26
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:284
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:155
@@ -6643 +6783 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:140
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:102
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6659 +6800 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:140
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:105
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6744 +6886 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:308
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:180
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "none"
 msgstr "none"
@@ -6832 +6974 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} way"
@@ -6842 +6984 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} relation"
@@ -7048 +7190 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
@@ -7056 +7198 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:127
@@ -7099 +7242 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:101
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -7140 +7284 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:671
 msgid "Conflict not resolved completely"
 msgstr "Conflict not resolved completely"
@@ -7292 +7437 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:909
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -7367 +7512 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1394
 msgid "Show/Hide"
 msgstr "Show/Hide"
@@ -7416 +7561 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:881
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:885
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:906
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
@@ -7428 +7573 @@
 msgstr "Information about layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:85
 msgid "configure the map painting style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:86
 msgid "MapPaint"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:315
 msgid "Turn selected styles on or off"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:387
 msgid "Reload from file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:388
 msgid "reload selected styles from file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:436
 msgid "Save as..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:433
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:437
 msgid "Save a copy of this Style to file and add it to the list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:478
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:223
 msgid "Reloading style sources"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:491
 #, java-format
 msgid "Save style ''{0}'' as ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 msgid "view meta information, error log and source definition"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:554
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
 msgid "Map Style info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:573
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
 msgstr "Source"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:597
 msgid "Title:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:599
 msgid "URL:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
+msgid "Built-in Style, internal path:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:603
+msgid "Path:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:606
+msgid "Icon:"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
-msgid "Built-in Style, internal path:"
+msgid "Background:"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
-msgid "Path:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614
-msgid "Icon:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617
-msgid "Background:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
 msgid "Style is currently active?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -7530 +7675 @@
 
 #. group "Relations"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:762
 #: build/trans_presets.java:4084
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 msgid "Open a list of all relations."
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358
 #: ../plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java:344
 #: ../plugins/relcontext/src/relcontext/actions/CreateRelationAction.java:40
@@ -7556 +7701 @@
 msgstr "Create a new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1442
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
 msgid "Set the current selection to the list of selected relations"
 msgstr "Set the current selection to the list of selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select the members of all selected relations"
 msgstr "Select the members of all selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:463
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:462
 #: ../plugins/relcontext/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr "Select members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:492
 msgid "Download all members of the selected relations"
 msgstr "Download all members of the selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
 msgid "Download members"
 msgstr "Download members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:525
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:860
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:862
 msgid "Download incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:760
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
@@ -7629 +7774 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1164
 #: ../plugins/relcontext/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7635 +7780 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1165
 #: ../plugins/relcontext/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:374
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:50
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:53
 msgid "Selection"
 msgstr "Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:514
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
@@ -7762 +7907 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:84
 msgid "Zoom to problem"
 msgstr "Zoom to problem"
@@ -9213 +9359 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
-#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:76
 msgid "Please enter an integer value > 0"
 msgstr "Please enter an integer value > 0"
@@ -9566 +9712 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:645
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:166
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:293
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:300
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:327
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:629
@@ -9582 +9730 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:320
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -9617 +9766 @@
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9624 +9773 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: build/trans_presets.java:2578
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:904
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:907
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:960
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:961
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:963
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:986
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1017
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1060
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1061
 #: ../plugins/relcontext/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1160
 #: ../plugins/relcontext/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1161
 #: ../plugins/relcontext/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
@@ -10799 +10948 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -11069 +11218 @@
 "was: {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:57
+#, fuzzy
+msgid "Download objects"
+msgstr "Download object"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:106
+#, fuzzy
+msgid "Initializing nodes to download ..."
+msgstr "Initialising nodes to update ..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:698
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:699
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1360
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -11827 +11986 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
@@ -11929 +12088 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:557
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:547
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -12151 +12310 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:270
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:319
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
 #, java-format
 msgid "There was {0} conflict detected."
@@ -12176 +12335 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialogue and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
 #, java-format
 msgid "{0} deleted"
@@ -12189 +12348 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:436
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:440
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:440
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:554
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:544
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651
 msgid "Following problems found:"
 msgstr "Following problems found:"
@@ -12339 +12498 @@
 msgstr "No validation errors"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:149
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:151
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:207
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:209
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:250
 #, java-format
 msgid ""
@@ -12367 +12526 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:258
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:264
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:560
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:534
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:567
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12385 +12544 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:546
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:579
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:628
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:582
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:649
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:680
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:618
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:685
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:642
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:709
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:714
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:725
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:726
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:763
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:777
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:788
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:823
+#, fuzzy
+msgid "Zoom to native resolution"
+msgstr "Zoom to selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
@@ -12953 +13117 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:191
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:72
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77
 #, java-format
@@ -12977 +13141 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:76
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:80
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85
 #, java-format
@@ -13964 +14128 @@
 msgstr "Set all to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:234
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:249
 msgid "Colors"
 msgstr "Colours"
@@ -13977 +14141 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:329
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:332
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:336
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:337
 msgid "All"
 msgstr "All"
@@ -13988 +14152 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
 msgid "None"
@@ -14423 +14587 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:445
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:754
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
 #: ../plugins/relcontext/src/relcontext/actions/CreateRelationAction.java:39
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
@@ -15048 +15212 @@
 msgstr "Shortcut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:314
 msgid "Icon paths:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Short Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:636
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:637
 #, java-format
 msgid "Author: {0}"
 msgstr "Author: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:640
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webpage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:645
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:646
 #, java-format
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#. content.add(scroller);
-#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:665
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
-msgid "Ok"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:670
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:671
 msgid "Name (optional):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:674
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:675
 msgid "URL / File:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:688
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:689
 msgid "active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:824
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:826
 msgid "Edit source entry:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:896
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
@@ -15106 +15263 @@
 msgstr "Reset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:897
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:899
 msgid "Reset to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1021
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1023
 msgid "Add a new icon path"
 msgstr "Add a new icon path"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1036
 msgid "Remove the selected icon paths"
 msgstr "Remove the selected icon paths"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1057
 msgid "Edit the selected icon path"
 msgstr "Edit the selected icon path"
@@ -15756 +15913 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1392
-#: ../plugins/terracer/src/terracer/TerracerAction.java:213
+#: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
 msgid "Change {0} object"
@@ -15839 +15996 @@
 "a bounding box)"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:74
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
@@ -16175 +16332 @@
 "zip file ''{0}''. Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
 #, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -16181 +16338 @@
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:327
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
@@ -16190 +16347 @@
 msgstr "Downloading OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:355
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr "Fetching node with id {0} from ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:356
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr "Fetching way with id {0} from ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:357
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr "Fetching relation with id {0} from ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr "Server replied with response code 404 for id {0}. Skipping."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr "Fetching a package of nodes from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:406
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr "Fetching a package of ways from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:407
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr "Fetching a package of relations from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:418
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -16231 +16388 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:444
 #, java-format
 msgid "Downloading {0} object from ''{1}''"
@@ -17041 +17198 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:103
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:106
 #, java-format
 msgid ""
@@ -17050 +17207 @@
 "or a trailing '?'."
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:104
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:107
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -17058 +17215 @@
 "settings."
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:105
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:108
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Warning: The complete URL is ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:127
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
 #, java-format
 msgid ""
@@ -17125 +17282 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:103
 msgid "Skip download"
 msgstr "Skip download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
 msgid "Download Plugin"
 msgstr "Download Plug-in"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:106
 msgid "Skip Download"
 msgstr "Skip Download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:107
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:108
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "JOSM version {0} required for plug-in {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:113
 msgid "Download skipped"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:119
 #, java-format
 msgid ""
@@ -17155 +17312 @@
 "Skipping download."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:140
 #, java-format
 msgid ""
@@ -17164 +17321 @@
 "valid URL. Skipping download."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:160
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
 msgstr "Failed to create plug-in directory ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:168
 #, java-format
 msgid "Downloading Plugin {0}..."
@@ -17506 +17663 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:42
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:47
 msgid "Reading local plugin information.."
 msgstr "Reading local plug-in information.."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:90
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:91
 msgid "Processing plugin site cache files..."
 msgstr "Processing plug-in site cache files..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:94
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:143
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:95
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:144
 #, java-format
 msgid "Processing file ''{0}''"
 msgstr "Processing file ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:98
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:153
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:99
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:154
 #, java-format
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
@@ -17529 +17686 @@
 "Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:116
 msgid "Processing plugin site cache icon files..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:140
 msgid "Processing plugin files..."
 msgstr "Processing plug-in files..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:66
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:67
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:78
 msgid "Download plugin list..."
 msgstr "Download plug-in list..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:160
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:209
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Downloading plug-in list from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
 #, java-format
 msgid ""
@@ -17557 +17714 @@
 "list from plug-in site ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:267
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Writing plug-in list to local cache ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:311
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Parsing plug-in list from site ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:326
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:316
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
 #, java-format
 msgid ""
@@ -17577 +17734 @@
 "Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:348
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -18352 +18509 @@
 #. Show name of profile in title
 #. no elevation data, -> switch back to empty view
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:97
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:288
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:313
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:92
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:299
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:324
 msgid "Elevation Profile"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:98
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:93
 msgid "Open the elevation profile window."
 msgstr ""
 
 #. first row: Headlines with bold font
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:135
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:130
 msgid "Min"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:138
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:133
 msgid "Avrg"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:141
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:136
 msgid "Max"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:144
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:139
 msgid "Dist"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:147
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:142
 msgid "Gain"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:150
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:145
 msgid "Time"
 msgstr ""
 
 #. Geoid
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:169
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:164
 msgid "Geoid"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:185
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:180
 msgid "Automatic"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:195
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:190
 msgid "Fixed value"
 msgstr ""
@@ -18520 +18677 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:55
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:168
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:138
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:137
 msgid "Segments"
 msgstr "Segments"
@@ -18674 +18831 @@
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:100
+msgid "ImproveWayAccuracy"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:101
+msgid "Improve Way Accuracy mode"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
+msgid "Improve Way Accuracy"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:187
+msgid "Click on the way to start improving its shape."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:189
+msgid "Select a way that you want to make more accurate."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:192
+msgid "Click to move the highlighted node. Hold Ctrl to add new nodes."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:194
+msgid "Click to add a new node. Release Ctrl to move existing nodes."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:352
+#, fuzzy
+msgid "Cannot place a node outside of the world."
+msgstr "Cannot add a node outside of the world."
+
+#. Finishing the sequence command
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:409
+#, fuzzy, java-format
+msgid "Add and a new node to way"
+msgid_plural "Add and a new node to {0} ways"
+msgstr[0] "Add and move a virtual new node to way"
+msgstr[1] "Add and move a virtual new node to {0} ways"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:80
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:82
 msgid "Edit opening hours"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:81
 msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
-msgid "Change properties of 1 object"
-msgstr ""
-
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
-#, java-format
-msgid "You have {0} Elements selected. But you can edit only one element!"
-msgstr ""
-
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:188
+#, fuzzy
+msgid "edit existing tag"
+msgstr "Edit Kissing Gate"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:195
+#, fuzzy
+msgid "edit new tag"
+msgstr "Add a new tag"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:251
 msgid "Choose key"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:83
 #, java-format
 msgid "apply {0}"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+#. TODO focus on the valueField
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:153
 msgid "There is something wrong in the value near:"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:156
 #, java-format
 msgid "Info: {0}"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:157
 msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:159
 msgid "Error in timeformat"
 msgstr ""
@@ -19093 +19293 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+msgid "Use address nodes under buildings"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:22
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Buildings tags:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:233
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:278
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:256
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:320
 msgid "Create building"
 msgstr "Create building"
@@ -20005 +20209 @@
 msgstr "Colour Schemes"
 
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:22
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java:41
+#, fuzzy
+msgid "Conflation"
+msgstr "Continue"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
+#, fuzzy
+msgid "Conflation tool for merging data"
+msgstr "Click to abort merging nodes"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:37
+msgid ""
+"There are no data layers present. Please open or create at least one data "
+"layer and try again."
+msgstr ""
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:39
+msgid "Cannot perform conflation"
+msgstr ""
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java:43
+msgid "Conflation symbols"
+msgstr ""
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:28
+#, fuzzy
+msgid "Conflation Options"
+msgstr "Connection Settings"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:55
+#, fuzzy
+msgid "Close the dialog, do not perform conflation"
+msgstr "Close the dialogue, do not create a new node"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:600
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:632
+#, fuzzy
+msgid "No valid OSM data layer present."
+msgstr "No GPX data layer found."
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:601
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:633
+#, fuzzy
+msgid "Error freezing selection"
+msgstr "remove from selection"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:606
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:638
+#, fuzzy
+msgid "Nothing is selected, please try again."
+msgstr "Nothing selected to zoom to."
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:607
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:639
+#, fuzzy
+msgid "Empty selection"
+msgstr "Update selection"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:670
+msgid "Unresolved differences remain, please fix remaining differences."
+msgstr ""
+
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:40
 msgid "Contour Merge"
@@ -20202 +20470 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:32
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
 msgid "Name:"
@@ -20918 +21185 @@
 msgid "Could not acquire image"
 msgstr "Could not acquire image"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:20
+msgid "Basic License Check."
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:21
+msgid "Checks if all contributors have agreed to the new CT/License."
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
+#, fuzzy
+msgid "Creator has rejected CT"
+msgstr "No relation is selected"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
+#, fuzzy
+msgid "Creator unknown"
+msgstr "unknown"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:56
+msgid "Creator has not (yet) accepted CT"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:66
+msgid "Object modified by user(s) who have rejected, or not agreed to, CT"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
+#, fuzzy
+msgid "License Check"
+msgstr "Licence"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
+#, fuzzy
+msgid "Performs the license check"
+msgstr "Properties checker :"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:101
+msgid "Loading from Quick History Service"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:145
+#, fuzzy
+msgid "Analyzing"
+msgstr "Initialising"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:103
+#, fuzzy
+msgid "Relicensing problems"
+msgstr "Painting problem"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
+#, fuzzy
+msgid "Open the relicensing window."
+msgstr "Open the validation window."
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:40
+#, fuzzy
+msgid "Relicensing Problems"
+msgstr "Painting problem"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:101
+#, fuzzy
+msgid "No relicensing problems"
+msgstr "Painting problem"
+
+#. * Error messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:15
+#, fuzzy
+msgid "Data loss"
+msgstr "Data sources"
+
+#. * Warning messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:19
+msgid "Possible data loss"
+msgstr ""
+
+#. * Other messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:23
+#, fuzzy
+msgid "Data reduction"
+msgstr "Direction"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
@@ -22301 +22653 @@
 msgstr "New value for {0}"
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:18
-msgid "Run..."
-msgstr ""
-
-#. title
-#. icon name
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:20
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:153
-msgid "Run a script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:80
-msgid "Select a script file and click on <strong>Run</strong>."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:108
-msgid "File:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:112
-msgid "Enter the name of a script file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:208
-msgid "Run"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:209
-msgid "Run the script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:216
-#, java-format
-msgid "The script file ''{0}'' doesn''t exist."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:217
-msgid "File not found"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:226
-msgid "Please enter a file name first."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:227
-msgid "Empty file name"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:236
-#, java-format
-msgid "The script file ''{0}'' isn''t readable."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237
-msgid "File not readable"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:246
-#, java-format
-msgid "Failed to read the script from the file ''{0}''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:247
-msgid "IO error"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:251
-#, java-format
-msgid "Failed to read a macro from the file ''{0}''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:258
-msgid "Script execution has failed."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:259
-msgid "Script Error"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:263
-msgid "Macro execution has failed."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:272
-msgid ""
-"<p>The script can''t be executed, because there are currently no scripting "
-"engines installed.</p><p>Refer to the online help for information about how "
-"to install a scripting engine with JOSM.</p>"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277
-msgid "No script engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:346
-msgid "..."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:347
-msgid "Launch file selection dialog"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:358
-msgid "Select a script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:56
-msgid "Warning: failed to load mime types from file ''0''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:65
-msgid "Warning: failed to load default mime types from  resource ''0''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:94
-msgid "Please select a scripting engine to execute the selected script."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:171
-msgid "Accept the selected scripting engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:195
-msgid "cancel"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptingPlugin.java:34
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:35
-msgid "Scripting"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:21
-msgid "Configure..."
-msgstr ""
-
-#. title
-#. icon name
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:23
-msgid "Configure scripting preferences"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:28
-msgid "Script engines"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:34
-msgid "Configure script engines and scripts"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:32
-#, java-format
-msgid "''{0}'' doesn''t exist."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:37
-#, java-format
-msgid "''{0}'' is a directory. Expecting a jar file instead."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:41
-#, java-format
-msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:48
-#, java-format
-msgid ""
-"Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-"this file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:53
-#, java-format
-msgid ""
-"The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' is "
-"missing."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:80
-msgid "JAR files"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:89
-msgid "Enter additional JAR files which provide script engines."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:135
-msgid "Available script engines"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:143
-msgid "JOSM currently supports the following script engines:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:203
-msgid "JAR file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:285
-msgid "Remove the selected jar files"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:309
-msgid "Add a jar file providing a script engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:393
-msgid "Launch file chooser"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:404
-msgid "Select a jar file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:26
-#, java-format
-msgid "{1} (with engine {0})"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:33
-msgid "Version:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:34
-msgid "Language:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:35
-msgid "Language version:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:36
-msgid "MIME-Types:"
-msgstr ""
-
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:48
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:49
@@ -22772 +22889 @@
 msgstr "Even/Odd"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:131
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:130
 msgid "Lowest number"
 msgstr "Lowest number"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:135
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:134
 msgid "Highest number"
 msgstr "Highest number"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:179
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:178
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr "Lowest housenumber cannot be higher than highest housenumber"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:207
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:206
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Housenumbers do not match odd/even setting"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:233
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:232
 msgid "Segment must be a number greater 1"
 msgstr "Segment must be a number greater 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:257
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:256
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} must be greater than 0"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:262
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:261
 #, java-format
 msgid "{0} is not a number"
@@ -22822 +22939 @@
 msgstr "Reverse Terrace"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:71
-#: ../plugins/terracer/src/terracer/TerracerAction.java:74
+#: ../plugins/terracer/src/terracer/TerracerAction.java:69
+#: ../plugins/terracer/src/terracer/TerracerAction.java:72
 msgid "Terrace a building"
 msgstr "Terrace a building"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:72
+#: ../plugins/terracer/src/terracer/TerracerAction.java:70
 msgid "Creates individual buildings from a long building."
 msgstr "Creates individual buildings from a long building."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:167
+#: ../plugins/terracer/src/terracer/TerracerAction.java:166
 msgid "Invalid selection"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:169
+#: ../plugins/terracer/src/terracer/TerracerAction.java:168
 msgid ""
 "Select a single, closed way of at least four nodes. (Optionally you can also "
@@ -22842 +22959 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:210
-#: ../plugins/terracer/src/terracer/TerracerAction.java:431
+#: ../plugins/terracer/src/terracer/TerracerAction.java:209
+#: ../plugins/terracer/src/terracer/TerracerAction.java:450
 msgid "Terrace"
 msgstr "Terrace"
@@ -23232 +23349 @@
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:129
 #, java-format
 msgid "{0} lanes are not referenced in any turn-relation."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:277
 msgid "Put the ways in order."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:365
 #, java-format
 msgid "Relation references non-existent (regular) lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:371
 #, java-format
 msgid "Relation references non-existent extra lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:396
 #, java-format
 msgid "Integer list \"{0}\" contains unexpected values."
@@ -24034 +24151 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:26
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:27
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:49
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:53
 msgid "Add nodes at intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:26
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
 msgid "Add missing nodes at intersections of selected ways."
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:39
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:43
 msgid "Please select one or more ways with intersections of segments."
 msgstr ""
@@ -24091 +24208 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:38
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:41
 msgid "More tools"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:20
+#, fuzzy
+msgid "Align Way Nodes"
+msgstr "Align Nodes in Line"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:24
@@ -24103 +24225 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:67
+#, java-format
+msgid "Internal error: number of nodes is {0}."
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:19
+#, fuzzy
+msgid "Paste Relations"
+msgstr "Parent Relations"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:22
 msgid ""
 "Paste relation membership from objects in the buffer onto selected object(s)"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:25
+#, fuzzy
+msgid "Replace Geometry"
+msgstr "replace selection"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:29
@@ -24129 +24266 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:19
+#, fuzzy
+msgid "Copy tags from previous selection"
+msgstr "Tags from relations"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:25
 msgid "Pastes tags of previously selected object(s)"
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:19
+#, fuzzy
+msgid "Add Source Tag"
+msgstr "Source"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:25
 msgid "Add remembered source tag"
@@ -24190 +24337 @@
 msgid "Too many ways are added: {0}!"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:28
+#, fuzzy
+msgid "Select last modified nodes"
+msgstr "Please select at least four nodes."
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:28
+#, fuzzy
+msgid "Select last modified ways"
+msgstr "Delete duplicate ways"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:32
@@ -24200 +24359 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:26
+#, fuzzy
+msgid "Undo selection"
+msgstr "Update selection"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:27
+msgid "Reselect last added object or selection form history"
+msgstr ""
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java:23
 msgid "Unselect nodes"
@@ -24286 +24454 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:143
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:191
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:193
 msgid "loop"
 msgstr ""
@@ -24330 +24498 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:180
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:185
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:186
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:190
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:191
 msgid "deinterlacing using linear interpolation"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:291
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:282
 msgid "Jump to"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:311
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:302
 msgid "Jump to GPS time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java:306
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java:307
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java:49
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java:53
 msgid "Sync"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:54
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:79
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:56
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:82
 msgid "Unable to find JNA Java library!"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:58
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:83
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:60
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:86
 msgid "Unable to find native libvlc library!"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:188
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:190
 msgid "play"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:192
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:194
 msgid "mute"
 msgstr ""
@@ -24965 +25133 @@
 msgstr ""
 
-#. Plugin contourmerge
+#. Plugin conflation
 #: build/trans_plugins.java:16
-msgid "Merges the contours of two areas"
+msgid "Tool for conflation (merging) data"
 msgstr ""
 
@@ -25073 +25241 @@
 msgstr ""
 
+#. Plugin ImproveWayAccuracy
+#: build/trans_plugins.java:56
+msgid ""
+"Can be useful when you are improving accuracy of existing ways. The idea of "
+"the plugin is to substitute dragging and dropping nodes with clicking to "
+"quicken the editing process."
+msgstr ""
+
 #. Plugin irsrectify
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin junctionchecking
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
@@ -25086 +25262 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
+#. Plugin licensechange
+#: build/trans_plugins.java:64
+msgid ""
+"Checks if all users contributing to an object have agreed to the license "
+"change."
+msgstr ""
+
 #. Plugin livegps
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:66
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -25099 +25282 @@
 #. File ../plugins/mapdust/build.xml had no data
 #. Plugin measurement
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:69
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -25110 +25293 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:71
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Adds no left turn for sets of 4 or 5 ways"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin namemanager
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:75
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:77
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -25136 +25319 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:79
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:81
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:83
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -25153 +25336 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:85
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -25160 +25343 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:87
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:89
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -25174 +25357 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:91
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -25183 +25366 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:93
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin proj4j
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:95
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:97
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -25200 +25383 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:99
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:101
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:103
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:105
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:107
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -25228 +25411 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:109
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -25237 +25420 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:111
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
-#. Plugin scripting
-#: build/trans_plugins.java:109
-msgid "Allows to run scripts in JOSM."
-msgstr ""
-
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -25255 +25433 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:113 build/trans_plugins.java:115
+#: build/trans_plugins.java:115 build/trans_plugins.java:117
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -25281 +25459 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:127
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:129
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -25298 +25476 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:131
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -25307 +25485 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -25318 +25496 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -25325 +25503 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -25343 +25521 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -25352 +25530 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -36885 +37063 @@
 msgstr "deciduous"
 
-#. item "Nature/Wood" combo "Type" display value
-#. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3835 build/trans_presets.java:3844
-msgid "mixed"
-msgstr "mixed"
-
 #. item "Nature/Forest"
 #: build/trans_presets.java:3837
@@ -41880 +42052 @@
 #~ "strong> is not available yet. It is missing both in your local language "
 #~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
+#~ "and fill in the missing information. You can both edit the <a href=\"{2}"
+#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
+#~ "\">help topic in english</a>.</p></html>"
 #~ msgstr ""
 #~ "<html><p class=\"warning-header\">Help content for help topic missing</"
@@ -41888 +42060 @@
 #~ "strong> is not available yet. It is missing both in your local language "
 #~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
+#~ "and fill in the missing information. You can both edit the <a href=\"{2}"
+#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
+#~ "\">help topic in english</a>.</p></html>"
 
 #~ msgid "Enter an upload comment (min. 3 characters)"
@@ -42200 +42372 @@
 #~ msgstr "Illegal tag/value combinations"
 
-#~ msgid "Painting problem"
-#~ msgstr "Painting problem"
-
 #~ msgid "Check for paint notes."
 #~ msgstr "Check for paint notes."