Changeset 18975 in osm for applications/editors/josm/i18n/po/fi.po

Timestamp:

2009-12-06T15:06:38+01:00 (17 years ago)

Author:

stoecker

Message:

updated

File:

• applications/editors/josm/i18n/po/fi.po (modified) (788 diffs)

applications/editors/josm/i18n/po/fi.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 16:20+0100\n"
-"PO-Revision-Date: 2009-11-08 14:30+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-12-06 14:57+0100\n"
+"PO-Revision-Date: 2009-12-01 17:02+0000\n"
+"Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-29 21:06+0000\n"
+"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -29 +29 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:298
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -45 +45 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
@@ -61 +61 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
@@ -86 +85 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
 msgid "Warning"
@@ -116 +115 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -137 +136 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -155 +154 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:343
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:49
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:241
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:149
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -187 +182 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:434
 msgid "Error"
 msgstr "Virhe"
@@ -259 +254 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
-msgstr ""
+msgstr "Tekijät"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
@@ -267 +262 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:269
 msgid "Plugins"
 msgstr "Liitännäiset"
@@ -308 +303 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
@@ -313 +310 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -324 +321 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
@@ -375 +370 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 msgstr ""
 "<html>Valittua tasoa <br>{0}<br>ei voi yhdistää mihinkään nykyisistä "
@@ -428 +423 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
 msgid "Latitude"
 msgstr "Leveysaste"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
 msgid "Longitude"
 msgstr "Pituusaste"
@@ -443 +438 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225
 msgid "Please enter a valid latitude in the range -90..90"
-msgstr ""
+msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228
 msgid "Please enter a latitude in the range -90..90"
-msgstr ""
+msgstr "Syötä leveyspiiri väliltä -90–90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr ""
+msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239
 msgid "Please enter a longitude in the range -180..180"
-msgstr ""
+msgstr "Syötä pituuspiiri väliltä -180–180"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
@@ -461 +456 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -476 +471 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276
 msgid "Close the dialog and create a new node"
-msgstr ""
+msgstr "Sulje ikkuna ja tee uusi solmu"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289
 msgid "Close the dialog, don't create a new node"
-msgstr ""
+msgstr "Sulje ikkuna tekemättä uutta solmua"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -495 +490 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -516 +514 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
@@ -534 +529 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
@@ -546 +541 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:371
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:661
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:87
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -638 +633 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 #, java-format
 msgid "File: {0}"
@@ -689 +684 @@
 "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:220
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
@@ -711 +706 @@
 msgstr "Valitse jotain kopioitavaksi."
 
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
 msgid "Create Circle"
 msgstr "Luo ympyrä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
 msgstr "Luo ympyrän kolmesta valitusta pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -735 +730 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:380
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
@@ -809 +804 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236
 #: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:73
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:89
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:218
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
@@ -831 +830 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
@@ -845 +844 @@
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
+msgstr "({0}/{1}) Ladataan solmun {2} emoelementit"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
+msgstr "({0}/{1}) Ladataan polun {2} emoelementtejä"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
+msgstr "({0}/{1}) Ladataan suhteen {2} emoelementtejä"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333
 msgid "Duplicate"
 msgstr "Monista"
@@ -887 +886 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
 msgid "Fullscreen View"
-msgstr ""
+msgstr "Kokoruututila"
 
 #. no icon
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
 msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Kokoruututila päälle/pois"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle Fullscreen view"
-msgstr ""
+msgstr "Kokoruututila päälle/pois"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -914 +913 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266
@@ -923 +920 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
@@ -934 +931 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -954 +951 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
@@ -978 +975 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
@@ -1000 +998 @@
 #, java-format
 msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr ""
+msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
@@ -1024 +1022 @@
 msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista."
 
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+msgid "Join overlapping Areas"
+msgstr "Yhdistä päällekkäiset alueet"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+msgid "Joins areas that overlap each other"
+msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130
+msgid "Only up to two areas can be joined at the moment."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135
+#, java-format
+msgid "\"{0}\" is not closed and therefore can't be joined."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
+msgid ""
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
+"Are you really sure to continue?"
+msgstr ""
+"Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
+"Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
+"poistamiseen.\n"
+"Oletko varma, että haluat jatkaa?"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
+msgid "Please abort if you are not sure"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+msgid "Please select at least one closed way the should be joined."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180
+msgid "No intersection found. Nothing was changed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+msgid "Added node on all intersections"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234
+msgid "Fix relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239
+msgid "Joined self-overlapping area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
+msgid "Joined overlapping areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244
+msgid ""
+"Some of the ways were part of relations that have been modified. Please "
+"verify no errors have been introduced."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+msgid "Enter values for all conflicts."
+msgstr "Syötä arvot kaikille ristiriidoille."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+msgid "Solve Conflicts"
+msgstr "Ratkaise ristiriitoja"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322
+msgid "Fix tag conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483
+msgid "Removed Element from Relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607
+msgid "Join Areas: Remove Short Ways"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623
+msgid "Closed Way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911
+msgid "Remove tags from inner ways"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943
+msgid "Join Areas Function"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
@@ -1041 +1139 @@
 msgstr "Ei pikanäppäintä"
 
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Jump To Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Opens a dialog that allows to jump to a specific location"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
+msgid "You can also paste an URL from www.openstreetmap.org"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
+msgid "Zoom (in metres)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+msgid "Jump there"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
+msgid "Jump to Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Could not parse Latitude, Longitude or Zoom. Please check."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Unable to parse Lon/Lat"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
@@ -1049 +1188 @@
 msgstr "Liitä nykyinen taso toiseen tasoon"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Yhdistä pisteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 msgid "Merge nodes into the oldest one."
 msgstr "Yhdistää pisteet vanhimpaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59
 msgid "Please select at least two nodes to merge."
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
 msgid "Abort Merging"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154
+msgstr "Peru sulautus"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
 msgid "Click to abort merging nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135
 #, java-format
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
+"Solmuja ei voi sulauttaa yhteen: Polku ''{0}'' pitäisi poistaa, mutta se on "
+"vielä käytössä."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231
 #, java-format
 msgid "Merge {0} nodes"
@@ -1216 +1357 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
 msgid "Download Data"
-msgstr ""
+msgstr "Lataa dataa"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1226 +1367 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46
 msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr ""
-"Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
+msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
@@ -1453 +1593 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid ""
-"Show status report with useful information that can be attached to bugs"
+msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Näytä tilaraportti virheraportteihin liittäessä hyödyllisin tiedoin."
 
@@ -1472 +1611 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
 msgid "Close"
 msgstr "Sulje"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
+msgid "Simplify Way"
+msgstr "Yksinkertaista polku"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
+msgid "Delete unnecessary nodes from a way."
+msgstr "Poistaa turhat pisteet polusta."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83
+msgid "Please select at least one way to simplify."
+msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
+#, java-format
+msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+msgid_plural ""
+"The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
+msgstr[1] ""
+"Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
+msgid "Are you sure?"
+msgstr "Oletko varma?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67
+#, java-format
+msgid "Simplify Way (remove {0} node)"
+msgid_plural "Simplify Way (remove {0} nodes)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73
@@ -1605 +1777 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
+msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
@@ -1688 +1859 @@
 
 #. bounds defined? => use the bbox downloader
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Päivitä valinta"
 
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
+msgid "There are no selected objects to update."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
-msgid "There are no selected objects to update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128
 msgid "Selection empty"
 msgstr "Valinta tyhjä"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153
 msgid "Update objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
 msgstr "Lähetä tietoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1746 +1917 @@
 "ensin.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
 msgid "Synchronize entire dataset"
 msgstr "Synkronoi koko tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256
 #, java-format
 msgid ""
@@ -1782 +1953 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304
 #, java-format
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332
 #, java-format
 msgid ""
@@ -1813 +1982 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340
 msgid "Changeset closed"
 msgstr "Muutoskokoelma suljettu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1839 +2008 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525
 msgid "Updating primitive"
 msgstr ""
@@ -1859 +2028 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
 #, java-format
 msgid ""
@@ -1867 +2036 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630
 #, java-format
 msgid "Uploading {0} objects ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
-#, java-format
-msgid ""
-"Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
 msgid "Upload selection"
 msgstr "Lähetä valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Lähetä kaikki valittujen objektion muutokset OSM-palvelimelle"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258
 msgid "Checking parents for deleted objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317
 #, java-format
 msgid "Reading parents of ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323
 msgid "Checking for deleted parents in the local dataset"
 msgstr ""
@@ -2062 +2230 @@
 "deleted on the server. If you later try to delete or<br>update them the "
 "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click "
-"<strong>{2}</strong> to ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
 msgstr ""
 
@@ -2131 +2299 @@
 msgstr "valitut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 msgid "Cannot add a node outside of the world."
 msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535
 msgid "Add node"
 msgstr "Lisää piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537
 msgid "Add node into way"
 msgstr "Lisää piste polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Connect existing way to node"
 msgstr "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
 msgid "Add a new node to an existing way"
 msgstr "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
 msgid "Add node into way and connect"
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:944
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:968
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
 msgid "Select node under cursor."
 msgstr "Valitse kursorin alla oleva piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:946
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2171 +2339 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:956
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
 msgstr "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:958
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr "Jatka polkua viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:981
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
 msgid "Finish drawing."
 msgstr "Lopeta piirtäminen."
@@ -2214 +2382 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
 msgstr ""
 
@@ -2264 +2432 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr ""
-"Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
+msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
@@ -2311 +2478 @@
 
 #. -- prepare the combo box with the search expressions
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a filter string."
@@ -2392 +2559 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2405 +2576 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2451 +2622 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286
 #, java-format
 msgid "Found {0} matches"
 msgstr "Löytyi {0} osumaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
 #, java-format
 msgid ""
@@ -2512 +2683 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590
 msgid "Missing arguments for or."
 msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
 msgid "Missing argument for not."
 msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
 msgid "Expected closing parenthesis."
 msgstr "Päättävä sulkumerkki puuttuu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672
 msgid "Wrong number of parameters for tags operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674
 #, java-format
 msgid ""
@@ -2554 +2725 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686
 #, java-format
 msgid ""
@@ -2565 +2736 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2616 +2787 @@
 #, java-format
 msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
+"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
 
@@ -2623 +2793 @@
 #, java-format
 msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
 msgstr ""
@@ -2757 +2927 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
 msgid "Double conflict"
 msgstr ""
@@ -2774 +2944 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:214
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
 msgid ""
@@ -2791 +2962 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+msgid "At least one object to delete required, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105
-#, java-format
-msgid "Parameter ''{0}'' must not be empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
-msgid "At least one object to delete required, got empty collection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:107
 msgid "At least one object to delete requird, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} object"
@@ -2812 +2983 @@
 msgstr[1] "Poista {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182
 #, java-format
 msgid "Delete {0} node"
@@ -2819 +2990 @@
 msgstr[1] "Poista {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183
 #, java-format
 msgid "Delete {0} way"
@@ -2826 +2997 @@
 msgstr[1] "Poista {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
 #, java-format
 msgid "Delete {0} relation"
@@ -2835 +3006 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
-msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you don't "
-"see) might use them.<br>Do you really want to delete?"
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
 msgstr ""
 "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
-"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää "
-"niitä.<br>Oletko varma, että haluat poistaa ne?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
+"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
+"<br>Oletko varma, että haluat poistaa ne?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444
 msgid "Delete confirmation"
 msgstr ""
@@ -2862 +3033 @@
 msgstr[1] "Siirrä {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154
 #, java-format
 msgid ""
@@ -2879 +3050 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -2887 +3058 @@
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
-msgid ""
-"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
 
@@ -2969 +3135 @@
 msgstr "Toteutetaanko?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3112 +3278 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 msgstr ""
 
@@ -3194 +3360 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3201 +3367 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3207 +3373 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "S"
 msgstr "E"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77
 msgid "N"
 msgstr "P"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "W"
 msgstr "L"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91
 msgid "E"
 msgstr "I"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3248 +3414 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #, java-format
 msgid "Missing merge target for way with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202
-#, java-format
-msgid "Missing merge target for node with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #, java-format
 msgid "Missing merge target for relation with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
@@ -3274 +3441 @@
 
 #. should not happen
-#. 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298
 #, java-format
 msgid ""
@@ -3336 +3503 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939
 msgid ""
 "Can''t merge because either of the participating primitives is new and the "
@@ -3361 +3528 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941
 #, java-format
 msgid ""
@@ -3391 +3558 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3411 +3578 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:33
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
@@ -3421 +3587 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
 #, java-format
-msgid ""
-"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3431 +3596 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:476
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
 msgid "No \"via\" node or way found."
 msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr ""
-"\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:795
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:994
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1054
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1084
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1392
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320
 msgid "untagged"
 msgstr "ei tageja"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1393
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321
 msgid "text"
 msgstr "teksti"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1394
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322
 msgid "areatext"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
 #, java-format
 msgid "Error: {0}"
 msgstr "Virhe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
 #, java-format
 msgid "Warning: {0}"
@@ -3573 +3737 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
@@ -3590 +3754 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3608 +3772 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "tausta"
@@ -3724 +3888 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3738 +3901 @@
 msgstr "Älä näytä uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3744 +3907 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "keskeneräinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "tie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 #: build/trans_presets.java:3186
 msgid "railway"
 msgstr "rata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #, java-format
 msgid "{0} node"
@@ -3778 +3941 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -4017 +4180 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
@@ -4036 +4199 @@
 msgstr "Muokkaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 msgid "View"
 msgstr "Näytä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Esivalinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
@@ -4059 +4222 @@
 msgstr "Valikko: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291
 msgid "Audio"
 msgstr "Ääni"
@@ -4101 +4264 @@
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4131 +4294 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
@@ -4239 +4402 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4246 +4409 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4253 +4416 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4270 +4433 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4285 +4448 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -4355 +4518 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374
 #, java-format
 msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
 #, java-format
 msgid "Item {0} not found in list."
@@ -4449 +4612 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4517 +4679 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4524 +4686 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4580 +4742 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 
@@ -4612 +4774 @@
 #, java-format
 msgid ""
-"<html>There are {0} additional primitives referred to by relation "
-"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
-"too?</html>"
+"<html>There are {0} additional primitives referred to by relation {1}"
+"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
+"</html>"
 msgstr ""
 
@@ -4758 +4920 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4891 +5053 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
 msgid "Apply"
 msgstr ""
@@ -4989 +5151 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
 #, java-format
 msgid "{0} way"
@@ -4999 +5161 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
 #, java-format
 msgid "{0} relation"
@@ -5032 +5194 @@
 msgstr ""
 
-#. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -5122 +5282 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
@@ -5185 +5345 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this "
-"conflict.<br>Conflict resolutions won't be applied unless all "
-"differences<br>are resolved.Click <strong>{0}</strong> to close "
-"anyway.<strong>Already<br>resolved differences won't be "
-"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
-"conflicts.</html>"
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5263 +5422 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 msgid "History"
 msgstr "Historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 msgid "Display the history of all selected items."
 msgstr "Näytä valittujen kohteiden historia."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:246
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5284 +5443 @@
 msgstr "Lataa uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
 msgid "Display the history of the selected objects."
 msgstr ""
@@ -5483 +5642 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5524 +5683 @@
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335
 #, java-format
 msgid "Selection: {0}"
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5551 +5710 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -5609 +5768 @@
 msgstr "# Objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
 msgid "Download all child relations (recursively)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download All Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
 msgid "Download selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
 msgid "Download Selected Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:41
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
 msgid "Download relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
 msgid "Conflicts in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
 #, java-format
 msgid ""
@@ -5648 +5807 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
 msgid "Relation is deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
 #, java-format
 msgid "Downloading relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
+#, fuzzy, java-format
+msgid "Downloading {0} incomplete child of relation ''{1}''"
+msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+msgstr[0] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
+msgstr[1] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#, fuzzy
+msgid "Download relations"
+msgstr "Latauksen sijainti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
+#, fuzzy, java-format
+msgid "({0}/{1}: Downloading relation ''{2}''..."
+msgstr "Aseta {0}={1} relaatiolle \"{2}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+msgid "Tags and Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
-msgid "Tags and Members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+msgid "Apply Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#, fuzzy
+msgid "Enter a role and apply it to the selected relation members"
+msgstr "Avaa valittu relaatio muokkaimeen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
 #, java-format
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620
 #, java-format
 msgid ""
@@ -5714 +5900 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5730 +5916 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5736 +5922 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
 #, java-format
 msgid ""
@@ -5758 +5944 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871
 msgid "Sort the relation members"
 msgstr ""
 
-#. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#, fuzzy
+msgid "Sort"
+msgstr "Urheilu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047
 msgid "No, continue editing"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+msgid ""
+"Click to to return to the relation editor and to resume relation editing"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
-msgid ""
-"Click to to return to the relation editor and to resume relation editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5826 +6016 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087
 msgid "Apply the current updates"
 msgstr "Tee muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the updates and close the dialog"
 msgstr "Tee muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
 msgid "Cancel the updates and close the dialog"
 msgstr "Peruuta muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
-msgid "Download all incomplete ways and nodes in relation"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
+#, fuzzy
+msgid "Download all incomplete members"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+msgid "Download selected incomplete members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #, java-format
 msgid ""
@@ -5882 +6078 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
-#. download the relation
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
-#, java-format
-msgid "Downloading relation ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to the object the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5956 +6145 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 msgid "Apply Changes"
 msgstr "Toteuta muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133
 #, java-format
 msgid "Create new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
 #, java-format
 msgid "Edit new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
 #, java-format
 msgid "Edit relation #{0} in layer ''{1}''"
@@ -5980 +6169 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: "
+msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
@@ -6160 +6348 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
 
@@ -6933 +7120 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7168 +7355 @@
 "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>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
 msgstr ""
 
@@ -7177 +7364 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is "
-"(untranslated):<br><tt>{1}</tt></p></html>"
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
 msgstr ""
 
@@ -7439 +7626 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Changeset info"
 msgstr "Muutoskokoelma"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121
 msgid "Launch browser with information about the changeset"
 msgstr "Avaa muutoskokoelman tiedot selaimessa"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140
 #, java-format
 msgid "Show changeset {0}"
@@ -7546 +7733 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -7634 +7820 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -7647 +7833 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which can't be "
-"written.<br>Either select another file for this layer or discard the "
-"changes.<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which can't be "
@@ -7701 +7887 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -7707 +7893 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -7778 +7964 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
 msgid "Upload"
 msgstr "Lähetä"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009
 msgid "Tags of new changeset"
 msgstr "Uuden muutoskokoelman tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
 msgid "Objects to add:"
 msgstr "Lisättävät objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
 msgid "Objects to modify:"
 msgstr "Muokattavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
 msgid "Objects to delete:"
 msgstr "Poistettavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
 #, java-format
 msgid "{0} object to add:"
@@ -7820 +8006 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
 #, java-format
 msgid "{0} object to modify:"
@@ -7827 +8013 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
 #, java-format
 msgid "{0} object to delete:"
@@ -7834 +8020 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496
 msgid "Upload the changed primitives"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
 msgid "Illegal upload comment"
 msgstr "Virheellinen kommentti"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513
+#, fuzzy
+msgid "Please enter a valid chunk size first"
+msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514
+msgid "Illegal chunk size"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550
 msgid "Cancel the upload and resume editing"
 msgstr "Peruuta lähetys ja jatka muokkausta"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624
-msgid "Upload all changes in one request"
-msgstr "Lähetä kaikki muutokset yhtenä pyyntönä"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660
 msgid "Enter an upload comment (min. 3 characters)"
 msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718
 msgid "Open a new changeset"
 msgstr "Avaa uusi muutoskokoelma"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
 "Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726
 msgid "Use an open changeset"
 msgstr "Käytä avonaista muutoskokoelmaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727
 msgid "Upload data to an already opened changeset"
 msgstr "Lähetä data avonaiseen muutoskokoelmaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767
 msgid "Close changeset after upload"
 msgstr "Sulje muutoskokoelma lähetyksen jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768
 msgid "Select to close the changeset after the next upload"
 msgstr ""
 "Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7905 +8090 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040
 msgid "Load the list of your open changesets from the server"
 msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054
 msgid "Close the currently selected open changeset"
 msgstr "Sulje valittuna oleva avoin muutoskokoelma"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -7922 +8107 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98
 #, java-format
 msgid ""
@@ -7930 +8115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112
 msgid "Preparing primitives to upload ..."
 msgstr "Lähetettävät objektit..."
@@ -7958 +8143 @@
 msgstr "Jatka lähetystä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
-msgid "Read GPX..."
-msgstr "Lue GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147
-#, java-format
-msgid "Reading {0}..."
-msgstr "Luetaan {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354
-msgid "No images with readable timestamps found."
-msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276
-msgid "Geotagged Images"
-msgstr "Geo-merkityt kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
-msgid "timezone difference: "
-msgstr "aikavyöhyke-ero: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
-msgid "image"
-msgid_plural "images"
-msgstr[0] "kuva"
-msgstr[1] "kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-msgid "Sync clock"
-msgstr "Tahdista kello"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-kuvat (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761
-msgid "Image"
-msgstr "Kuva"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778
-msgid "Synchronize Time with GPS Unit"
-msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808
-msgid "Time entered could not be parsed."
-msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
+#, java-format
+msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71
+#, fuzzy
+msgid "Upload data in one request"
+msgstr "Lähetä kaikki muutokset yhtenä pyyntönä"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90
+msgid "Upload data in chunks of objects. Chunk size: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115
+msgid "Upload each object individually"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206
+msgid "(1 request)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217
+msgid "(# requests unknown)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221
+#, fuzzy, java-format
+msgid "({0} request)"
+msgid_plural "({0} requests)"
+msgstr[0] "{0} metriä"
+msgstr[1] "{0} metriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260
+msgid "Illegal chunk size <= 0. Please enter an integer > 1"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262
+#, fuzzy
+msgid "Please enter an integer > 1"
+msgstr "Syötä käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265
+#, java-format
+msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
@@ -8070 +8200 @@
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -8101 +8231 @@
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -8108 +8238 @@
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -8115 +8245 @@
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points don''t include a timestamp we can''t correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points don''t include a timestamp we can''t correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-kuvat (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
 msgid "Name: {0}"
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -8174 +8309 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
 #, java-format
 msgid "{0} track"
@@ -8182 +8317 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3190
@@ -8188 +8323 @@
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} route, "
@@ -8212 +8342 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:447
 #, java-format
 msgid "{0} waypoint"
@@ -8219 +8349 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
@@ -8246 +8376 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 #, java-format
 msgid ""
 "<html>This action will require {0} individual<br>download requests. Do you "
 "wish<br>to continue?</html>"
-msgstr ""
-"<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
+msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8288 +8417 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8294 +8423 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8319 +8448 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid ""
@@ -8331 +8460 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
 #, java-format
 msgid ""
@@ -8342 +8471 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
 #, java-format
 msgid "{0} deleted"
@@ -8355 +8484 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721
 msgid "Dataset consistency test"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
+msgid "No problems found"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
-msgid "No problems found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
 msgid "Following problems found:"
 msgstr ""
@@ -8388 +8517 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
-msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
@@ -8428 +8557 @@
 msgstr[1] "{0} pistettä"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131
+msgid "GPX Files (*.gpx *.gpx.gz)"
+msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152
+#, java-format
+msgid "File {0} is loaded yet under the name \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Virhe tulkittaessa {0}:aa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Ei voitu lukea \"{0}\":aa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224
+msgid ""
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Ota kuva GPS-vastaanottimesi kellonäytöstä.<br>Valitse tähän ottamasi "
+"kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<hr></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
+msgid "Photo time (from exif):"
+msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
+msgid "Gps time (read from the above photo): "
+msgstr "GPS:n aika (lue ylläolevasta kuvasta): "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
+msgid " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [pp/kk/vvvv tt:mm:ss]"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277
+msgid "I'm in the timezone of: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376
+msgid "No date"
+msgstr "Ei päivämäärää"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349
+msgid "Open an other photo"
+msgstr "Avaa toinen kuva"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+msgid "Synchronize time from a photo of the GPS receiver"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+msgid ""
+"Error while parsing the date.\n"
+"Please use the requested format"
+msgstr ""
+"Ajan muotoa ei ymmärretty.\n"
+"Ole hyvä ja syötä aika pyydetyssä muodossa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+msgid "Invalid date"
+msgstr "Virheellinen päivämäärä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449
+msgid "<No GPX track loaded yet>"
+msgstr "<Ei ladattuja GPS-jälkiä>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455
+msgid "GPX track: "
+msgstr "GPX-jälki: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460
+msgid "Open another GPX trace"
+msgstr "Avaa toinen GPX-jälki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476
+msgid "Timezone: "
+msgstr "Aikavyöhyke: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498
+msgid "Offset:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
+msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+msgid "Update position for: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+msgid "All images"
+msgstr "Kaikki kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546
+msgid "Images with no exif position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
+msgid "Not yet tagged images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577
+msgid "Correlate images with GPX track"
+msgstr "Kohdista kuvia GPX-jälkeen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+msgid "Correlate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+msgid "Auto-Guess"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592
+msgid "You should select a GPX track"
+msgstr "Valitse GPX-jälki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593
+msgid "No selected GPX track"
+msgstr "GPX-jälkeä ei valittuna"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605
+#, java-format
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606
+msgid "Invalid timezone"
+msgstr "Virheellinen aikavyöhyke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618
+#, java-format
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619
+msgid "Invalid offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
+#, java-format
+msgid "Found {0} matches of {1} in GPX track {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660
+msgid "GPX Track loaded"
+msgstr "GPX-jälki ladattu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
+msgid "The selected photos don't contain time information."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696
+msgid "Photos don't contain time information"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730
+msgid ""
+"The selected GPX track doesn't contain timestamps. Please select another one."
+msgstr ""
+"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731
+msgid "GPX Track has no time information"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778
+#, java-format
+msgid "Seconds: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795
+#, java-format
+msgid "Matched {0} of {1} photos to GPX track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798
+#, java-format
+msgid "(Time difference of {0} days)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805
+#, java-format
+msgid "Offset between track and photos: {0}m {1}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+msgid ""
+"An error occurred while trying to match the photos to the GPX track. You can "
+"adjust the sliders to manually match the photos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869
+msgid "Matching photos to track failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+msgid "Adjust timezone and offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
+msgid "Default Values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
+msgid "Extracting GPS locations from EXIF"
+msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130
+msgid "Starting directory scan"
+msgstr "Tutkii hakemistoa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135
+msgid "One of the selected files was null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144
+msgid "Read photos..."
+msgstr "Luetaan kuvia..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156
+#, java-format
+msgid "Reading {0}..."
+msgstr "Luetaan {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#, java-format
+msgid "Unable to get canonical path for directory {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210
+#, java-format
+msgid "Scanning directory {0}"
+msgstr "Tutkii hakemistoa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215
+#, java-format
+msgid "Found null file in directory {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218
+#, java-format
+msgid "Error while getting files from directory {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+msgid "Geotagged Images"
+msgstr "Geo-merkityt kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352
+msgid "Correlate to GPX"
+msgstr "Sijoittele GPX-tiedoston mukaisesti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370
+msgid "image"
+msgid_plural "images"
+msgstr[0] "kuva"
+msgstr[1] "kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371
+#, java-format
+msgid "{0} were found to be gps tagged."
+msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+msgid "No image"
+msgstr "Ei kuvaa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452
+#, java-format
+msgid "Loading {0}"
+msgstr "Ladataan {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481
+#, java-format
+msgid "Error on file {0}"
+msgstr "Virhe tiedostossa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+#, fuzzy
+msgid "Display geotagged images"
+msgstr "Näytä geo-merkityt kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89
+msgid "Remove photo from layer"
+msgstr "Poista kuva tasosta"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
+msgid "Center view"
+msgstr "Keskitä näkymä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+msgid "Zoom best fit and 1:1"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186
+#, java-format
+msgid ""
+"\n"
+"Altitude: {0} m"
+msgstr ""
+"\n"
+"Korkeus: {0} m"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189
+#, java-format
+msgid ""
+"\n"
+"{0} km/h"
+msgstr ""
+"\n"
+"{0} km/h"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
@@ -8725 +9202 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8917 +9394 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid ""
-"Draw the direction arrows using table lookups instead of complex math."
+msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Piirrä suuntanuolet käyttäen etsintätaulukkoa kompleksilukulaskujen sijaan."
@@ -8980 +9456 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
@@ -9048 +9523 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Ulkoasu ja käyttötuntuma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+msgid "Language"
+msgstr "Kieli"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
+msgid "Looking up available translations..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
 msgid "Default (Auto determined)"
 msgstr "Oletusarvo (automaattisesti päätetty)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66
-msgid "Language"
-msgstr "Kieli"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112
-msgid "Looking up available translations..."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
@@ -9321 +9796 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -9386 +9861 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes "
-"here.</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
 msgstr ""
 
@@ -9398 +9873 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key "
-"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
-"instead. Not doing so may result in conflicts, as there is no way for JOSM "
-"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
-"keyboard...</p>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
+"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not "
+"doing so may result in conflicts, as there is no way for JOSM to know that "
+"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
 msgstr ""
 "<p>Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei "
@@ -9433 +9907 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-"encountered.</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
+"</p>"
 msgstr ""
 
@@ -9525 +9999 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
@@ -9610 +10084 @@
 msgstr "Ladataan pisteet {0}-{1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
 #, java-format
@@ -9616 +10090 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
 #, java-format
 msgid ""
@@ -9736 +10210 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
-#, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Can't infer primitive type."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
+#, java-format
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
@@ -9771 +10244 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450
+#, fuzzy, java-format
+msgid "Downloading {0} object from ''{1}''"
+msgid_plural "Downloading {0} objects from ''{1}''"
+msgstr[0] "Ladataan pisteet {0}-{1}..."
+msgstr[1] "Ladataan pisteet {0}-{1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -9830 +10310 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174
-#, java-format
-msgid ""
-"It supports protocol versions 0.5 and 0.6, while the server says it supports "
-"{0} to {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
+#, java-format
+msgid ""
+"It supports protocol version 0.6, while the server says it supports {0} to "
+"{1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263
 #, java-format
 msgid ""
@@ -9858 +10338 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Creating changeset..."
 msgstr "Muutoskokoelmaa luodaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Muutoskokoelma {0} avattiin onnistuneesti"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335
 msgid "Updating changeset..."
 msgstr "Muutoskokoelmaa päivitetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Muutoskokoelmaa {0} päivitetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
 msgid "Closing changeset..."
 msgstr "Muutoskokoelmaa suljetaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394
 msgid "No changeset present for diff upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Uploading..."
 msgstr "Lähetetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600
 msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -9952 +10432 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9977 +10457 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9983 +10463 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9994 +10474 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -10050 +10530 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences "
-"file.<br>The password is transferred in plain text to the server, encoded in "
-"the URL.<br><b>Do not use a valuable Password.</b></html>"
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -10078 +10558 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
 msgstr ""
 
@@ -10143 +10623 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
-#, java-format
-msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
-#, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277
 #, java-format
 msgid ""
@@ -10190 +10669 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
 msgid "Illegal object with ID=0."
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #, java-format
 msgid ""
@@ -10212 +10691 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378
 #, java-format
 msgid ""
@@ -10223 +10702 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
 #, java-format
 msgid ""
@@ -10249 +10728 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447
 #, java-format
 msgid ""
@@ -10256 +10735 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496
 #, java-format
 msgid ""
@@ -10262 +10741 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
 #, java-format
 msgid ""
@@ -10269 +10748 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563
 msgid "Preparing data set..."
 msgstr ""
@@ -10328 +10807 @@
 msgid "Contacting Server..."
 msgstr "Yhdistetään palvelimeen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
+#, java-format
+msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
@@ -10363 +10848 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:78
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään pistettä ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään polkua ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
-"{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
+msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:120
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#, java-format
+msgid "Value >0 expected for parameter ''{0}'', got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
+msgid "Starting to upload in chunks..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151
+#, java-format
+msgid "({0}/{1}) Uploading {2} objects..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
 msgid "Uploading data ..."
 msgstr "Lähetetään dataa..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
-msgid ""
-"WARNING: no API version defined for data to upload. Falling back to version "
-"0.6"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153
-#, java-format
-msgid ""
-"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-"use diff uploads, but API is not able to handle them. Ignoring diff upload."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
@@ -10441 +10926 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146
+#, fuzzy, java-format
+msgid "Delete old plugin {0}"
+msgstr "Poista {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153
+#, fuzzy, java-format
+msgid "Delete old plugin file {0}"
+msgstr "Virhe poistettaessa liitännäistiedostoa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:142
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:169
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10463 +10958 @@
 msgstr "Tapahtui virhe liitännäisessä {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
-#, java-format
-msgid ""
-"Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#, java-format
+msgid "Plugin {0} is no longer necessary and has been deactivated."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
 #, java-format
 msgid ""
 "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be "
-"disabled.<br>Delete from preferences?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+"developed and very likely will produce errors.<br>It should be disabled."
+"<br>Delete from preferences?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102
 msgid ""
 "You updated your JOSM software.\n"
@@ -10484 +10978 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:115
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 msgid "Update plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 msgid "Skip update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10509 +11003 @@
 "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Liitännäistä ei löytynyt: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:212
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid "Disable plugin"
 msgstr "Poista liitännäinen käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10538 +11032 @@
 "on oikeus korvata vanhat tiedostot."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
+msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10560 +11053 @@
 "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324
 msgid "Should the plugin be disabled?"
 msgstr "Pitäisikö liitännäinen poistaa käytöstä?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10572 +11065 @@
 "liitännäisen käytöstä."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
@@ -10697 +11190 @@
 "<html><p>There the the error information provided below should already "
 "be<br>filled out for you. Please include information on how to "
-"reproduce<br>the error and try to supply as much detail as "
-"possible.</p></html>"
+"reproduce<br>the error and try to supply as much detail as possible.</p></"
+"html>"
 msgstr ""
 
@@ -10734 +11227 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 
@@ -10795 +11288 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
 
@@ -10807 +11299 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 msgid ""
-"The area you tried to download is too big or your request was too "
-"large.<br>Either request a smaller area or use an export file provided by "
-"the OSM community."
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
 msgstr ""
 
@@ -10839 +11331 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 
@@ -11096 +11588 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
 #: build/trans_presets.java:2296
 msgid "Address Interpolation"
@@ -11109 +11601 @@
 msgstr ""
 
-#. NOTE: The following 2 arrays must match in number of elements and position
-#. Tag values for map
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11122 +11612 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Numeric"
+msgstr ""
+
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Actual"
+msgstr "kivihiili"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Estimate"
+msgstr "kuva"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Potential"
+msgstr "Vuokraamo"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
+msgid "Increment:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
+msgid "Accuracy:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
+msgid "Convert way to individual house numbers."
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+msgid "Expected valid number for address increment"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
 msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "Display geotagged photos"
-msgstr "Näytä geo-merkityt kuvat"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
-msgid "Remove photo from layer"
-msgstr "Poista kuva tasosta"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
-msgid "Center view"
-msgstr "Keskitä näkymä"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
-msgid "Zoom best fit and 1:1"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
-#, java-format
-msgid ""
-"\n"
-"Altitude: {0} m"
-msgstr ""
-"\n"
-"Korkeus: {0} m"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
-#, java-format
-msgid ""
-"\n"
-"{0} km/h"
-msgstr ""
-"\n"
-"{0} km/h"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
-msgid "Extracting GPS locations from EXIF"
-msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
-msgid "Starting directory scan"
-msgstr "Tutkii hakemistoa"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126
-msgid "One of the selected files was null"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:132
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:135
-msgid "Read photos..."
-msgstr "Luetaan kuvia..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186
-#, java-format
-msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
-#, java-format
-msgid "Scanning directory {0}"
-msgstr "Tutkii hakemistoa {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204
-#, java-format
-msgid "Found null file in directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207
-#, java-format
-msgid "Error while getting files from directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296
-msgid "Correlate to GPX"
-msgstr "Sijoittele GPX-tiedoston mukaisesti"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
-msgid "Open images with AgPifoJ..."
-msgstr "Avaa kuvia AgPifoJ:llä..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
-msgid "Load set of images as a new layer."
-msgstr "Lataa kuvat uutena tasona."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
-msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
-#, java-format
-msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Virhe tulkittaessa {0}:aa"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Ei voitu lukea \"{0}\":aa"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
-msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Ota kuva GPS-vastaanottimesi kellonäytöstä.<br>Valitse tähän ottamasi "
-"kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<hr></html>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
-msgid "Photo time (from exif):"
-msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
-msgid "Gps time (read from the above photo): "
-msgstr "GPS:n aika (lue ylläolevasta kuvasta): "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269
-msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr " [pp/kk/vvvv tt:mm:ss]"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
-msgid "I'm in the timezone of: "
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
-msgid "No date"
-msgstr "Ei päivämäärää"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
-msgid "Open an other photo"
-msgstr "Avaa toinen kuva"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
-msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
-msgid ""
-"Error while parsing the date.\n"
-"Please use the requested format"
-msgstr ""
-"Ajan muotoa ei ymmärretty.\n"
-"Ole hyvä ja syötä aika pyydetyssä muodossa"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
-msgid "Invalid date"
-msgstr "Virheellinen päivämäärä"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
-msgid "<No GPX track loaded yet>"
-msgstr "<Ei ladattuja GPS-jälkiä>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
-msgid "GPX track: "
-msgstr "GPX-jälki: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
-msgid "Open another GPX trace"
-msgstr "Avaa toinen GPX-jälki"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
-msgid "Timezone: "
-msgstr "Aikavyöhyke: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
-msgid "Offset:"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
-msgid ""
-"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
-msgid "Update position for: "
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
-msgid "All images"
-msgstr "Kaikki kuvat"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
-msgid "Images with no exif position"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
-msgid "Not yet tagged images"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-msgid "Correlate images with GPX track"
-msgstr "Kohdista kuvia GPX-jälkeen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
-msgid "Correlate"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
-msgid "Auto-Guess"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
-msgid "You should select a GPX track"
-msgstr "Valitse GPX-jälki"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593
-msgid "No selected GPX track"
-msgstr "GPX-jälkeä ei valittuna"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
-#, java-format
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606
-msgid "Invalid timezone"
-msgstr "Virheellinen aikavyöhyke"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
-#, java-format
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619
-msgid "Invalid offset"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659
-#, java-format
-msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660
-msgid "GPX Track loaded"
-msgstr "GPX-jälki ladattu"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695
-msgid "The selected photos don't contain time information."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696
-msgid "Photos don't contain time information"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr ""
-"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731
-msgid "GPX Track has no time information"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
-#, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
-#, java-format
-msgid "Seconds: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
-#, java-format
-msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798
-#, java-format
-msgid "(Time difference of {0} days)"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
-#, java-format
-msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
-msgid ""
-"An error occurred while trying to match the photos to the GPX track. You can "
-"adjust the sliders to manually match the photos."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
-msgid "Matching photos to track failed"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Adjust timezone and offset"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
-msgid "Default Values"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
-msgid "No image"
-msgstr "Ei kuvaa"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443
-#, java-format
-msgid "Loading {0}"
-msgstr "Ladataan {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:472
-#, java-format
-msgid "Error on file {0}"
-msgstr "Virhe tiedostossa {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
@@ -11709 +11891 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
 msgstr ""
 
@@ -12019 +12200 @@
 msgid "Export as PNG format (only raster images)"
 msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:63
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137
-#, java-format
-msgid "Simplify Way (remove {0} node)"
-msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -12137 +12310 @@
 msgstr ""
 
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+msgid "Split area"
+msgstr ""
+
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
-msgid "Split area"
-msgstr ""
-
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
 msgid "Splits an area by an untagged way."
 msgstr ""
 
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
 msgid ""
 "The selected area cannot be splitted, because it is a member of some "
@@ -12452 +12625 @@
 msgstr "Avaa kuvat ImageWayPoint:lla"
 
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Load set of images as a new layer."
+msgstr "Lataa kuvat uutena tasona."
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
 msgid "Direction index '{0}' not found"
@@ -12493 +12670 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
 msgstr "Poistetaan turhat pisteet..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:198
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
 msgid "Running Douglas-Peucker approximation..."
 msgstr "Suoritetaan Douglas-Peucker-arviointi..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:209
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
 msgstr "Poistetaan pisteiden kaksoiskappaleet..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:285
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
 msgid "Lakewalker trace"
@@ -12553 +12730 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -12563 +12740 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -12571 +12748 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -12578 +12755 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -12586 +12763 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -12662 +12839 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Suurin sallittu yhteyksien määrä kussakin luodussa polussa. Oletusarvo on "
@@ -12686 +12862 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
 "Douglas-Peucker-yksinkertaistamisen tarkkuus asteina.<br>Pienemmät arvot "
@@ -12752 +12927 @@
 msgstr "Kuvaa ei voitu ladata"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239
 msgid "Connection Failed"
 msgstr "Yhteys epäonnistui"
@@ -12812 +12986 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-"Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa."
+msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa."
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
@@ -12985 +13158 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
+msgid "Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -13067 +13239 @@
 msgstr "Tuntematon tiedostopääte: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:41
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:95
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -13079 +13252 @@
 "asetusten karttasivulta."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126
-msgid "osmarender options"
-msgstr ""
-
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
 msgid "Firefox executable"
 msgstr ""
@@ -13360 +13529 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr ""
-"Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!"
+msgstr "Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -13457 +13625 @@
 msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
 msgid "Reverse Terrace"
 msgstr ""
@@ -13511 +13679 @@
 msgid "Optional"
 msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-msgid "Join overlapping Areas"
-msgstr "Yhdistä päällekkäiset alueet"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-msgid "Joins areas that overlap each other"
-msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132
-#, java-format
-msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65
-msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.\n"
-"This can lead to nodes being deleted accidentally.\n"
-"Are you really sure to continue?"
-msgstr ""
-"Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
-"Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
-"poistamiseen.\n"
-"Oletko varma, että haluat jatkaa?"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68
-msgid "Please abort if you are not sure"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166
-msgid "Please select at least one closed way the should be joined."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
-msgid "No intersection found. Nothing was changed."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
-msgid "Added node on all intersections"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
-msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
-msgid "Fix relations"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
-msgid "Joined overlapping areas"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
-msgid ""
-"Some of the ways were part of relations that have been modified. Please "
-"verify no errors have been introduced."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Enter values for all conflicts."
-msgstr "Syötä arvot kaikille ristiriidoille."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
-msgid "Solve Conflicts"
-msgstr "Ratkaise ristiriitoja"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
-msgid "Fix tag conflicts"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
-msgid "Removed Element from Relations"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
-msgid "Closed Way"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
-msgid "Remove tags from inner ways"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
-msgid "Join Areas Function"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-msgid "Jump To Position"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
-msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
-msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-msgid "Jump there"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
-msgid "Jump to Position"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
-msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
-msgid "Unable to parse Lon/Lat"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-msgid "Simplify Way"
-msgstr "Yksinkertaista polku"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-msgid "Delete unnecessary nodes from a way."
-msgstr "Poistaa turhat pisteet polusta."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83
-msgid "Please select at least one way to simplify."
-msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88
-#, java-format
-msgid "The selection contains {0} way. Are you sure you want to simplify it?"
-msgid_plural ""
-"The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
-msgstr[1] ""
-"Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
-msgid "Are you sure?"
-msgstr "Oletko varma?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
@@ -13769 +13776 @@
 msgstr "muut tarkistukset"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
 #, java-format
 msgid "Running test {0}"
@@ -13822 +13829 @@
 msgstr "Ohita valitut virheet seuraavalla kerralla."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Whole group"
 msgstr "Koko ryhmä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Single elements"
 msgstr "Yksittäiset elementit"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Ignore whole group or individual elements?"
 msgstr "Ohitetaanko koko ryhmä vai yksittäiset elementit?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignoring elements"
 msgstr "Ohitetaan elementit"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:459
 msgid "Fixing errors ..."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:483
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:500
 msgid "Updating map ..."
 msgstr ""
@@ -13898 +13905 @@
 msgstr "Risteävät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:73
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:44
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:68
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:130
 msgid "Confirmation"
 msgstr ""
@@ -14146 +14153 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 msgid ""
-"The sources (URL or filename) of spell check (see "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
-"data files."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
 "Oikeinkirjoitustarkistimen ja ominaisuustarkistimen sääntötiedostot (URL-"
-"osoite tai tiedostonimi) (lisätietoja "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller )"
+"osoite tai tiedostonimi) (lisätietoja http://wiki.openstreetmap.org/index."
+"php/User:JLS/speller )"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
@@ -14193 +14199 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
 msgid "Check if map painting found data errors."
-msgstr ""
-"Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
+msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
@@ -14296 +14301 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -14302 +14307 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -14310 +14315 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -14317 +14322 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -14324 +14329 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -14331 +14336 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -14338 +14343 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -14345 +14350 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building" b="yes"/>
@@ -14392 +14397 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -14527 +14532 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:54
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
 msgid "Way Download"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56
 msgid "Download map data on the end of selected way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:98
 msgid ""
 "<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -14543 +14548 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:106
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:105
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:117
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:167
 #, java-format
 msgid ""
@@ -14559 +14564 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:181
 #, java-format
 msgid ""
@@ -14569 +14574 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:194
 msgid "Merge duplicate node?"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:211
 msgid "<html>No more connected ways to download.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:220
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
@@ -14731 +14736 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -14850 +14855 @@
 #. This file can be used to add some special messages to the translation,
 #. which are not part of the programm texts, but should be translated nevertheless.
-#. 
+#.
 #: build/specialmessages.java:6
 msgid ""
@@ -14888 +14893 @@
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
-msgid "Group common Address Interpolation inputs in a single dialog,"
-msgstr ""
-
-#. Plugin AgPifoJ
+msgid ""
+"Group common Address Interpolation inputs in a single dialog, as well as an "
+"option to automatically generate individual house number nodes from a Way."
+msgstr ""
+
+#. Plugin cadastre-fr
 #: build/trans_plugins.java:5
-msgid ""
-"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-"import EXIF geotagged pictures."
-msgstr ""
-
-#. Plugin cadastre-fr
+msgid "A special handler for the French land registry WMS server."
+msgstr ""
+
+#. Plugin colorscheme
 #: build/trans_plugins.java:7
-msgid "A special handler for the French land registry WMS server."
-msgstr ""
-
-#. Plugin colorscheme
-#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14914 +14914 @@
 
 #. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:9
+msgid "Create a grid of ways."
+msgstr ""
+
+#. Plugin czechaddress
 #: build/trans_plugins.java:11
-msgid "Create a grid of ways."
-msgstr ""
-
-#. Plugin czechaddress
+msgid ""
+"Creating and handling address nodes and buildings within Czech Republic."
+msgstr ""
+
+#. Plugin dataimport
 #: build/trans_plugins.java:13
-msgid ""
-"Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
-
-#. Plugin dataimport
+msgid "Allows to import various file formats into JOSM directly."
+msgstr ""
+
+#. Plugin DirectUpload
 #: build/trans_plugins.java:15
-msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
-
-#. Plugin DirectUpload
-#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14937 +14937 @@
 
 #. Plugin Duplicate-Way
+#: build/trans_plugins.java:17
+msgid "Duplicate Ways with an offset"
+msgstr ""
+
+#. Plugin editgpx
 #: build/trans_plugins.java:19
-msgid "Duplicate Ways with an offset"
-msgstr ""
-
-#. Plugin editgpx
-#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14949 +14949 @@
 
 #. Plugin globalsat
+#: build/trans_plugins.java:21
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgstr ""
+
+#. Plugin graphview
 #: build/trans_plugins.java:23
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
-
-#. Plugin graphview
+msgid "Visualizes routing information as a routing graph."
+msgstr ""
+
+#. Plugin grid
 #: build/trans_plugins.java:25
-msgid "Visualizes routing information as a routing graph."
-msgstr ""
-
-#. Plugin grid
+msgid "Provide a background layer that displays a map grid"
+msgstr ""
+
+#. Plugin ImageWayPoint
 #: build/trans_plugins.java:27
-msgid "Provide a background layer that displays a map grid"
-msgstr ""
-
-#. Plugin ImageWayPoint
-#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14973 +14972 @@
 
 #. Plugin lakewalker
+#: build/trans_plugins.java:29
+msgid "Helps vectorizing WMS images."
+msgstr ""
+
+#. Plugin livegps
 #: build/trans_plugins.java:31
-msgid "Helps vectorizing WMS images."
-msgstr ""
-
-#. Plugin livegps
+msgid ""
+"Support live GPS input (moving dot) through a connection to gpsd server."
+msgstr ""
+
+#. Plugin measurement
 #: build/trans_plugins.java:33
-msgid ""
-"Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr ""
-
-#. Plugin measurement
-#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14992 +14991 @@
 
 #. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
+#. Plugin multipoly
 #: build/trans_plugins.java:37
-msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
-
-#. Plugin multipoly
-#: build/trans_plugins.java:39
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -15004 +15003 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -15012 +15011 @@
 
 #. Plugin openlayers
+#: build/trans_plugins.java:41
+msgid "Displays an OpenLayers background image"
+msgstr ""
+
+#. Plugin openstreetbugs
 #: build/trans_plugins.java:43
-msgid "Displays an OpenLayers background image"
-msgstr ""
-
-#. Plugin openstreetbugs
+msgid "Imports issues from OpenStreetBugs"
+msgstr ""
+
+#. Plugin openvisible
 #: build/trans_plugins.java:45
-msgid "Imports issues from OpenStreetBugs"
-msgstr ""
-
-#. Plugin openvisible
+msgid ""
+"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgstr ""
+
+#. Plugin osmarender
 #: build/trans_plugins.java:47
 msgid ""
-"Allows opening gpx/osm files that intersect the currently visible screen area"
-msgstr ""
-
-#. Plugin osmarender
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr ""
+
+#. Plugin PicLayer
 #: build/trans_plugins.java:49
-msgid ""
-"Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
-
-#. Plugin PicLayer
-#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -15041 +15040 @@
 
 #. Plugin plastic_laf
+#: build/trans_plugins.java:51
+msgid "The great JGoodies Plastic Look and Feel."
+msgstr ""
+
+#. Plugin remotecontrol
 #: build/trans_plugins.java:53
-msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
-
-#. Plugin remotecontrol
+msgid "Let other applications send commands to JOSM."
+msgstr ""
+
+#. Plugin routes
 #: build/trans_plugins.java:55
-msgid "Let other applications send commands to JOSM."
-msgstr ""
-
-#. Plugin routes
-#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -15058 +15057 @@
 
 #. Plugin routing
+#: build/trans_plugins.java:57
+msgid "Provides routing capabilities."
+msgstr ""
+
+#. Plugin slippymap
 #: build/trans_plugins.java:59
-msgid "Provides routing capabilities."
-msgstr ""
-
-#. Plugin slippymap
-#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -15070 +15069 @@
 
 #. Plugin surveyor
+#: build/trans_plugins.java:61
+msgid "Allow adding markers/nodes on current gps positions."
+msgstr ""
+
+#. Plugin tageditor
 #: build/trans_plugins.java:63
-msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
-
-#. Plugin tageditor
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr ""
+
+#. Plugin tagging-preset-tester
 #: build/trans_plugins.java:65
-msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
-
-#. Plugin tagging-preset-tester
-#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -15088 +15087 @@
 
 #. Plugin terracer
+#: build/trans_plugins.java:67
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin validator
 #: build/trans_plugins.java:69
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin utilsplugin
-#: build/trans_plugins.java:71
-msgid ""
-"Several utilities that make your life easier: e.g. simplify way, join areas, "
-"jump to position."
-msgstr ""
-
-#. Plugin validator
-#: build/trans_plugins.java:73
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -15107 +15099 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:71
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -15114 +15106 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:73
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:75
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -16170 +16162 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#. 
+#.
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -16368 +16360 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -16376 +16368 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -16393 +16385 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -16401 +16393 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -16418 +16410 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -16426 +16418 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -16443 +16435 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -16451 +16443 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -16464 +16456 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -16480 +16472 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -16496 +16488 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -16503 +16495 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -16511 +16503 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -16529 +16521 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -16536 +16528 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -16544 +16536 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -16592 +16584 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- junction tag -->
-#. 
+#.
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -17291 +17283 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
+#.
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:932
@@ -17328 +17320 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
+#.
 #. <!-- *** access *** -->
 #: build/trans_presets.java:954
@@ -17422 +17414 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
+#.
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -17577 +17569 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -18962 +18954 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -18970 +18962 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -18978 +18970 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -18986 +18978 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -19342 +19334 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -19352 +19344 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -19360 +19352 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -19368 +19360 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -19376 +19368 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -19384 +19376 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -19392 +19384 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -19400 +19392 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -19408 +19400 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -19416 +19408 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -19424 +19416 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -19432 +19424 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -19440 +19432 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -19448 +19440 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -19456 +19448 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -19464 +19456 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -19472 +19464 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -19480 +19472 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -19488 +19480 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -19496 +19488 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -19504 +19496 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -19512 +19504 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -19520 +19512 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -19528 +19520 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -19536 +19528 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -19544 +19536 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -19552 +19544 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -19560 +19552 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -19568 +19560 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -19576 +19568 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -19584 +19576 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -19592 +19584 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -19600 +19592 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -19608 +19600 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -19616 +19608 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -19624 +19616 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -19632 +19624 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -19640 +19632 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -19648 +19640 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -19656 +19648 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -19664 +19656 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -19672 +19664 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -19680 +19672 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -19688 +19680 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -19696 +19688 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -19704 +19696 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -19712 +19704 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -21404 +21396 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -21414 +21406 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -21422 +21414 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -21430 +21422 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -21438 +21430 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -21446 +21438 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -21454 +21446 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -21462 +21454 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -22791 +22783 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -22805 +22797 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -22814 +22806 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -22824 +22816 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -22832 +22832 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -22848 +22840 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -22879 +22871 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -22893 +22885 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -22901 +22893 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -22909 +22901 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -22918 +22910 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -22945 +22937 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -23058 +23050 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#. 
+#.
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the rbest matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#. 
+#.
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -23068 +23060 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#. 
+#.
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -23076 +23068 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#. 
+#.
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#. 
+#.
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -23091 +23083 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -23097 +23089 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -23144 +23136 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -23223 +23215 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -23231 +23223 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -23238 +23230 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -23246 +23238 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -23253 +23245 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -23260 +23252 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -23267 +23259 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -23274 +23266 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -23281 +23273 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -23288 +23280 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="gate"/>
@@ -23295 +23287 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cattle_grid"/>
@@ -23302 +23294 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="toll_booth"/>
@@ -23309 +23301 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -23316 +23308 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -23323 +23315 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="viaduct"/>
@@ -23331 +23323 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="viaduct"/>
@@ -23338 +23330 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <!-- deprecated; use information=guidepost instead -->
@@ -23347 +23339 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="marsh"/>
@@ -23357 +23349 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--abutters tags -->
-#. 
+#.
 #. <!--accessories tags -->
-#. 
+#.
 #. <!--properties tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -23370 +23362 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--"deprecated" tags -->
-#. 
+#.
 #. <!-- historic=museum -> tourism=museum -->
 #. <rule>
@@ -23381 +23373 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_wind -> power=generator and power_source=wind -->
 #. <rule>
@@ -23390 +23382 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 #. <rule>
@@ -23399 +23391 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 #. <rule>
@@ -23408 +23400 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 #. <rule>
@@ -23417 +23409 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway classification now more detailed -->
 #. <rule>
@@ -23426 +23418 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- amenity=park_bench -> amenity=bench -->
 #. <rule>
@@ -23436 +23428 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway=stile -> barrier=stile -->
 #. <rule>
@@ -23445 +23437 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 #. <rule>
@@ -23468 +23460 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -23475 +23467 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -23482 +23474 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -23496 +23488 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -23508 +23500 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -23515 +23507 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -23522 +23514 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -23529 +23521 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -23536 +23528 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -23543 +23535 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -23550 +23542 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -23557 +23549 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -23564 +23556 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -23571 +23563 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -23578 +23570 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -23585 +23577 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -23592 +23584 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -23599 +23591 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -23606 +23598 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -23775 +23767 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -23789 +23781 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -23797 +23789 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -23807 +23799 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -23815 +23807 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -23823 +23815 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -23831 +23823 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -23845 +23837 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23853 +23845 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23861 +23853 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23869 +23861 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23877 +23869 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23885 +23877 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23893 +23885 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23910 +23902 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -23917 +23909 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -23929 +23921 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -23941 +23933 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -23948 +23940 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -23960 +23952 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -23973 +23965 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -23986 +23978 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -23998 +23990 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -24010 +24002 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -24017 +24009 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -24024 +24016 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
@@ -24036 +24028 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -24044 +24036 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -24051 +24043 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -24058 +24050 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -24065 +24057 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -24073 +24065 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -24082 +24074 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -24090 +24082 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -24100 +24092 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -24108 +24100 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -24116 +24108 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -24125 +24117 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -24133 +24125 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -24141 +24133 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -24149 +24141 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -24157 +24149 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -24165 +24157 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -24173 +24165 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -24181 +24173 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -24189 +24181 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -24210 +24202 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -24220 +24212 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -24227 +24219 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -24235 +24227 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -24242 +24234 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -24250 +24242 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -24258 +24250 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -24272 +24264 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -24281 +24273 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -24298 +24290 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -24306 +24298 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24317 +24309 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24333 +24325 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -24340 +24332 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -24347 +24339 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -24354 +24346 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -24365 +24357 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -24378 +24370 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -24390 +24382 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -24398 +24390 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -24410 +24402 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -24422 +24414 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -24429 +24421 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -24439 +24431 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -24447 +24439 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -24455 +24447 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -24463 +24455 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -24477 +24469 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- piste tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -24492 +24484 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -24505 +24497 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -24518 +24510 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -24531 +24523 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -24544 +24536 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -24557 +24549 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -24567 +24559 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -24574 +24566 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -24582 +24574 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -24590 +24582 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -24598 +24590 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -24606 +24598 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -24614 +24606 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -24622 +24614 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -24630 +24622 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -24638 +24630 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -24646 +24638 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -24654 +24646 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -24662 +24654 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -24680 +24672 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -24693 +24685 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -24704 +24696 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -24714 +24706 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -24722 +24714 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -24730 +24722 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -24738 +24730 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -24746 +24738 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -24754 +24746 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -24762 +24754 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -24770 +24762 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -24778 +24770 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -24786 +24778 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -24794 +24786 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -24802 +24794 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -24810 +24802 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -24818 +24810 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -24837 +24829 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -24849 +24841 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -24859 +24851 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -24867 +24859 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -24875 +24867 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -24883 +24875 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -24891 +24883 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -24899 +24891 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -24907 +24899 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -24922 +24914 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -24930 +24922 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -24938 +24930 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -24946 +24938 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -24954 +24946 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -24962 +24954 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -24970 +24962 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -24978 +24970 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -24986 +24978 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -24994 +24986 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -25002 +24994 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -25010 +25002 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -25027 +25019 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -25035 +25027 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -25042 +25034 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -25050 +25042 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -25058 +25050 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -25066 +25058 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -25073 +25065 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -25081 +25073 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -25089 +25081 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -25097 +25089 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -25105 +25097 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -25112 +25104 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -25119 +25111 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -25126 +25118 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -25133 +25125 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -25140 +25132 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -25147 +25139 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -25154 +25146 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -25161 +25153 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -25168 +25160 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -25175 +25167 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -25182 +25174 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -25189 +25181 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -25196 +25188 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -25204 +25196 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -25212 +25204 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -25220 +25212 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -25228 +25220 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -25236 +25228 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -25244 +25236 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -25252 +25244 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -25260 +25252 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -25268 +25260 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -25277 +25269 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -25285 +25277 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -25293 +25285 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -25301 +25293 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -25309 +25301 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -25317 +25309 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -25325 +25317 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -25333 +25325 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -25341 +25333 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -25349 +25341 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -25357 +25349 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -25365 +25357 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -25373 +25365 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -25381 +25373 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -25389 +25381 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -25397 +25389 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -25405 +25397 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -25413 +25405 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -25421 +25413 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -25428 +25420 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -25458 +25450 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -25466 +25458 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -25474 +25466 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--natural tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -25489 +25481 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -25497 +25489 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -25505 +25497 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -25513 +25505 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -25521 +25513 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -25529 +25521 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -25537 +25529 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -25551 +25543 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -25561 +25553 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -25569 +25561 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -25577 +25569 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -25585 +25577 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -25593 +25585 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -25601 +25593 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -25609 +25601 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -25617 +25609 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -25625 +25617 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -25633 +25625 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -25641 +25633 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -25649 +25641 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -25657 +25649 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -25665 +25657 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -25673 +25665 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -25681 +25673 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -25689 +25681 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -25697 +25689 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -25705 +25697 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -25713 +25705 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -25721 +25713 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -25729 +25721 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -25737 +25729 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -25745 +25737 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -25753 +25745 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -25761 +25753 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -25769 +25761 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -25777 +25769 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -25785 +25777 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -25793 +25785 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -25801 +25793 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -25809 +25801 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -25817 +25809 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -25825 +25817 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -25833 +25825 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -25841 +25833 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -25849 +25841 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -25857 +25849 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -25865 +25857 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -25873 +25865 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -25881 +25873 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -25889 +25881 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -25923 +25915 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -25933 +25925 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -25941 +25933 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -25949 +25941 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -25957 +25949 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -25965 +25957 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -25973 +25965 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -25981 +25973 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -25996 +25988 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -26004 +25996 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -26012 +26004 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -26020 +26012 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -26028 +26020 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -26036 +26028 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -26045 +26037 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -26053 +26045 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -26061 +26053 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -26069 +26061 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -26076 +26068 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -26083 +26075 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -26099 +26091 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -26109 +26101 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -26117 +26109 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -26125 +26117 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -26133 +26125 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -26141 +26133 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -26149 +26141 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -26157 +26149 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -26165 +26157 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -26173 +26165 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -26190 +26182 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -26202 +26194 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -26214 +26206 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -26222 +26214 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -26234 +26226 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="forest"/>
@@ -26246 +26238 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -26258 +26250 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -26267 +26259 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -26279 +26271 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -26291 +26283 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -26303 +26295 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -26315 +26307 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -26327 +26319 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -26335 +26327 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -26345 +26337 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -26353 +26345 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -26361 +26353 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -26369 +26361 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -26384 +26376 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -26395 +26387 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -26407 +26399 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -26419 +26411 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -26431 +26423 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -26440 +26432 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -26448 +26440 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -26456 +26448 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -26464 +26456 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -26472 +26464 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -26487 +26479 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -26499 +26491 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -26511 +26503 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -26523 +26515 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -26535 +26527 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -26547 +26539 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -26554 +26546 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -26564 +26556 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -26572 +26564 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -26580 +26572 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -26588 +26580 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -26596 +26588 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -26604 +26596 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -26612 +26604 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
@@ -26627 +26619 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -26637 +26629 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -26645 +26637 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -26653 +26645 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -26661 +26653 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
@@ -26675 +26667 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -26699 +26691 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -26708 +26700 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -26722 +26714 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -26730 +26722 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -26738 +26730 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -26746 +26738 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -26754 +26746 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -26762 +26754 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -26770 +26762 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -26778 +26770 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -26786 +26778 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -26794 +26786 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -26802 +26794 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -26810 +26802 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -26828 +26820 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -26835 +26827 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -26842 +26834 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -26849 +26841 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -26856 +26848 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -26863 +26855 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -26956 +26948 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -26962 +26954 @@
 #. relation    - a relation
 #. *           - all data types
-#. 
+#.
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#. 
+#.
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#. 
+#.
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#. 
+#.
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#. 
+#.
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#. 
+#.
 #. The comment at the end of a rule is displayed in validator description
-#. 
+#.
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -27098 +27090 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -27109 +27101 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#. 
+#.
 #. different forms for web access
 #. must be html:<url>
@@ -27132 +27124 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -27140 +27132 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -27154 +27146 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#. 
-#. 
+#.
+#.
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -27167 +27159 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#. 
-#. 
+#.
+#.
 #. only for GB
 #. fails with division by zero error
@@ -27186 +27178 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -27209 +27201 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#. 
-#. 
+#.
+#.
 #. only for Italy
 #: build/trans_wms.java:46
@@ -27221 +27213 @@
 msgstr ""
 
+#~ msgid "Read GPX..."
+#~ msgstr "Lue GPX..."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#~ msgid "timezone difference: "
+#~ msgstr "aikavyöhyke-ero: "
+
+#~ msgid "Sync clock"
+#~ msgstr "Tahdista kello"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Tahdista aika GPS-yksikön kanssa"
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein."
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Avaa kuvia AgPifoJ:llä..."
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -27257 +27291 @@
 #~ msgstr "Tuntematon tiedostopääte."
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
-
 #~ msgid "Error parsing server response."
 #~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
@@ -27278 +27309 @@
 #~ msgstr "Muokkaa"
 
-#, java-format
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
 #~ msgid "Move"
 #~ msgstr "Siirrä"
@@ -27303 +27330 @@
 #~ msgstr "EPSG:4326"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Virhe ladattaessa sivua {0}"
@@ -27338 +27364 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti yhdistää "
-#~ "ne?"
+#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
 
 #~ msgid "Only one node selected"
@@ -27351 +27377 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti yhdistää "
-#~ "ne?"
+#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
 
 #~ msgid "All the ways were empty"
@@ -27368 +27394 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi ja "
-#~ "siirtääksesi näkymää."
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
 
 #~ msgid "Click Reload to refresh list"
@@ -27381 +27407 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus "
-#~ "tulee,<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#, java-format
+#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
+#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
+
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
@@ -27392 +27417 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai yritä "
-#~ "myöhemmin uudestaan."
+#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
+#~ "yritä myöhemmin uudestaan."
 
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
@@ -27400 +27425 @@
 #~ "virhetilanteeseen."
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Käytä esivalintaa ”{0}”"
@@ -27411 +27435 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
@@ -27432 +27456 @@
 #~ msgstr "Lisää uusi tagien esivalintalähde listaan."
 
-#, java-format
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}"
-
 #~ msgid "Plugin already exists"
 #~ msgstr "Liitännäinen on jo olemassa"
@@ -27442 +27462 @@
 #~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
@@ -27496 +27515 @@
 #~ msgstr "pyöräkartta"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -27502 +27520 @@
 #~ msgstr[1] "{0} objektilla on ristiriitoja:"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
 #~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
@@ -27531 +27548 @@
 #~ msgstr "Lähetä OSM-palvelimelle..."
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
 #~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata "
 #~ "automaattisesti."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -27552 +27568 @@
 #~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -27567 +27582 @@
 #~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Muokkaajat: {0}"
 
-#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Ristiriidat: {0}"
@@ -27579 +27592 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia "
@@ -27593 +27606 @@
 #~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded in "
-#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
-#~ "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista "
-#~ "salausta.<br>Salasana lähetetään salaamattomana palvelimelle URL-"
-#~ "osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></html>"
+#~ "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman "
+#~ "minkäänlaista salausta.<br>Salasana lähetetään salaamattomana "
+#~ "palvelimelle URL-osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></"
+#~ "html>"
 
 #~ msgid "Portcullis"
@@ -27606 +27620 @@
 #~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
@@ -27618 +27631 @@
 #~ "lähettämistä."
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Tee virheilmoitus osoitteessa {0}"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
@@ -27635 +27646 @@
 #~ msgstr "Siirrä ylöspäin"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relaatioeditori: {0}"
@@ -27656 +27666 @@
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr ""
-#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä."
+#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä "
+#~ "pistettä."
 
 #~ msgid ""
@@ -27668 +27679 @@
 #~ msgstr "Julkinen"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että haluat "
-#~ "jatkaa?"
+#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
+#~ "haluat jatkaa?"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut karttatietoja."
+#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut "
+#~ "karttatietoja."
 
 #~ msgid ""
@@ -27691 +27703 @@
 #~ msgstr "Päivitys epäonnistui"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
 #~ "<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "