Changeset 18273 in osm for applications/editors/josm/i18n/po/de.po

Timestamp:

2009-10-25T13:31:57+01:00 (15 years ago)

Author:

stoecker

Message:

updated i18n

File:

• applications/editors/josm/i18n/po/de.po (modified) (152 diffs)

applications/editors/josm/i18n/po/de.po

@@ -9 +9 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 15:06+0200\n"
-"PO-Revision-Date: 2009-10-17 15:13+0200\n"
+"POT-Creation-Date: 2009-10-25 13:10+0100\n"
+"PO-Revision-Date: 2009-10-25 13:17+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-17 12:22+0000\n"
+"X-Launchpad-Export-Date: 2009-10-25 12:04+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -27 +27 @@
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:202
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:99
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 msgid "Help"
@@ -50 +50 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
@@ -73 +73 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../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/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -94 +95 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:78
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:128
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -126 +126 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:489
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
@@ -161 +160 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:650
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:658
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -168 +167 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:162
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
@@ -183 +182 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -282 +282 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../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:247
 msgid "Plugins"
 msgstr "Plugins"
@@ -339 +339 @@
 #: ../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:357
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../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:506
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
@@ -420 +422 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -516 +518 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
@@ -530 +532 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
@@ -615 +617 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
@@ -674 +676 @@
 "Reihenfolge gebracht werden)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy"
 msgstr "Kopie"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "Gewählte Objekte in die Zwischenablage kopieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum Kopieren auswählen."
@@ -721 +723 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
@@ -783 +785 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -801 +804 @@
 msgstr "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download parent ways/relations..."
 msgstr "Elternrelationen, -wege herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "ID > 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/command/Command.java:66
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' darf nicht null sein"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #, java-format
@@ -819 +844 @@
 msgstr "Es traten {0} Konflikte während des Imports auf."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
 msgid "Conflicts during download"
 msgstr "Konflikte beim Herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:147
-#, java-format
-msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr "({0}/{1}) Eltern des Objekts {2} laden"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#, java-format
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Eltern des Knotens {2} laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#, java-format
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Eltern des Wegs {2} laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Eltern der Relation {2} laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Auswahl durch Kopieren und sofortiges Einfügen duplizieren."
@@ -880 +915 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:456
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -947 +981 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
@@ -997 +1031 @@
 msgstr "Knotenpunkt und Linie vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
 msgid "No Shortcut"
 msgstr "Kein Tastenkürzel"
@@ -1091 +1125 @@
 msgstr "Verschiebt Objekte {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
@@ -1157 +1191 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
-#, fuzzy
 msgid "Start downloading data"
-msgstr "Daten herunterladen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
@@ -1177 +1210 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#, fuzzy
 msgid "Orthogonalize Shape / Undo"
-msgstr "Form rechtwinklig machen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
@@ -1186 +1218 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
-#, fuzzy
 msgid "Orthogonalize / Undo"
-msgstr "Rechtwinklig machen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
@@ -1198 +1229 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
-#, fuzzy
 msgid "Undo Orthogonalize Shape"
-msgstr "Form rechtwinklig machen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
@@ -1225 +1255 @@
 msgstr "Rechtwinklig machen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 msgid "Paste contents of paste buffer."
 msgstr "Inhalt der Zwischenablage einfügen."
 
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
 msgid "Paste Tags"
 msgstr "Merkmale einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
 #, java-format
 msgid "Pasting {0} tag"
@@ -1251 +1280 @@
 msgstr[1] "{0} Merkmale einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
 #, java-format
 msgid "to {0} primitive"
@@ -1420 +1449 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1780 +1809 @@
 msgstr "Änderungssatz geschlossen"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#, fuzzy
+msgid "Prepare conflict resolution"
+msgstr "Konfliktlösung abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+#, java-format
+msgid "Click to download all parent ways for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#, fuzzy
+msgid "Click to cancel and to resume editing the map"
+msgstr "Diesen Dialog schließen und Bearbeitung in JOSM fortsetzen"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgid ""
+"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
+"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
+"download all parent ways of node {0}.<br>If necessary JOSM will create "
+"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+msgid "Node still in use"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#, fuzzy, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 msgid "Upload to OSM API failed"
 msgstr "Hochladen zu OSM-API fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
 msgid "Updating primitive"
 msgstr "Objekt aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1805 +1863 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:569
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
 #, java-format
@@ -1822 +1880 @@
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Alle Änderungen in der aktuellen Auswahl zum OSM-Server hochladen."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' darf nicht null sein"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
@@ -2107 +2158 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
@@ -2116 +2167 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
@@ -2179 +2230 @@
 msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
@@ -2185 +2236 @@
 "Punkt vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2584 +2635 @@
 msgid "Add relation {0}"
 msgstr "Relation {0} hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
+#, java-format
+msgid "Added {0} objects"
+msgstr "{0} Objekte wurden hinzugefügt"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2664 +2720 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
 msgid "Double conflict"
 msgstr "Doppelter Konflikt"
@@ -2701 +2757 @@
 msgstr "Kann unentschiedenen Konflikt nicht auflösen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
 msgid "Delete {0} object"
@@ -2708 +2764 @@
 msgstr[1] "{0} Objekte löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183
 #, java-format
 msgid "Delete {0} node"
@@ -2715 +2771 @@
 msgstr[1] "{0} Knoten löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
 #, java-format
 msgid "Delete {0} way"
@@ -2722 +2778 @@
 msgstr[1] "{0} Wege löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185
 #, java-format
 msgid "Delete {0} relation"
@@ -2729 +2785 @@
 msgstr[1] "{0} Relationen löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
 msgid "Conflicting relation"
 msgstr "Konflikt mit Relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
 #, java-format
 msgid ""
@@ -2747 +2803 @@
 "verwendet.<br>Aus Relation entfernen?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
 #, java-format
 msgid ""
@@ -2756 +2812 @@
 "Relation entfernen?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#. FIXME: relation memberships are not handled
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
@@ -2762 +2819 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
 msgid ""
@@ -2773 +2830 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
 msgid "Delete confirmation"
 msgstr "Löschbestätigung"
@@ -3118 +3175 @@
 msgid "Changeset {0}"
 msgstr "Änderungssatz {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:454
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../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:72
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
 
 #. translators notes must be in front
@@ -3182 +3229 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
 #, java-format
 msgid "Error: {0}"
 msgstr "Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
 #, java-format
 msgid "Warning: {0}"
 msgstr "Warnung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:319
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:375
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3207 +3254 @@
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:377
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
 #, java-format
 msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
@@ -3219 +3266 @@
 "Name."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55
 #, java-format
 msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
@@ -3275 +3323 @@
 msgstr "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../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
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105
 msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -3287 +3344 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:250
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:487
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:866
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:646
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:654
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:663
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:667
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:694
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:698
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:821
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:875
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:887
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:945
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1034
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Innerer Weg \"{0}\" ist außerhalb."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1099
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1125
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1421
 msgid "untagged"
 msgstr "Ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1330
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1422
 msgid "text"
 msgstr "Text"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
+msgid "areatext"
+msgstr "Flächentext"
+
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
 #, java-format
 msgid ""
@@ -3427 +3488 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3436 +3497 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3445 +3506 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3479 +3540 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -3493 +3555 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-msgid "Lambert Zone (France)"
-msgstr "Lambert-Zone (Frankreich)"
+msgid "Lambert 4 Zones (France)"
+msgstr "4 Lambert-Zonen (Frankreich)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
+msgid "Lambert CC9 Zone (France)"
+msgstr "Lambert-CC9-Zone (Frankreich)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3633 +3699 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:101
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:22
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
 msgid "Show help information"
 msgstr "Hilfe anzeigen"
@@ -4015 +4081 @@
 msgstr "Initialisieren"
 
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
+#, fuzzy
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
+"relation</strong>.</html>"
+msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
+#, fuzzy, java-format
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
+"relations</strong>.</html>"
+msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
+#, fuzzy, java-format
+msgid ""
+"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
+"relations</strong>.</html>"
+msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
+#, java-format
+msgid "Deleting {0} object"
+msgid_plural "Deleting {0} objects"
+msgstr[0] "{0} Objekt löschen"
+msgstr[1] "{0} Objekte löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
+msgid "Delete objects"
+msgstr "Objekte löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
+#, fuzzy
+msgid "To delete"
+msgstr "nicht gelöscht"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
+msgid "From Relation"
+msgstr "Von Relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr "Pos."
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
+msgid "Role"
+msgstr "Rolle"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
+msgid "Click to close the dialog and remove the object from the relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
+msgid "Click to close the dialog and to abort deleting the objects"
+msgstr ""
+
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
@@ -4048 +4178 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4063 +4193 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4560 +4690 @@
 msgid "Undecide conflict between visible state"
 msgstr "Löschstatus ist unterschiedlich."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
-msgid "Role"
-msgstr "Rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -4711 +4833 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
 msgid "Apply"
 msgstr "Übernehmen"
@@ -4859 +4981 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
 msgid "Role:"
 msgstr "Rolle:"
@@ -4879 +5001 @@
 msgid "Apply this role to all members"
 msgstr "Füge die Rolle zu allen Mitglieder hinzu."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
-msgid "Pos."
-msgstr "Pos."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
@@ -4918 +5036 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5164 +5282 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:110
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<unterschiedlich>"
@@ -5250 +5368 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
 #: build/trans_presets.java:3145
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 msgid "Open a list of all relations."
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5285 +5403 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
 msgid "Set the current selection to the list of selected relations"
 msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
@@ -5312 +5430 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5417 +5535 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
 msgid "Download relation members"
 msgstr "Relationselemente herunterladen"
@@ -5447 +5565 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
 msgid "Tags and Members"
 msgstr "Merkmale und Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
+#: ../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 "Relationen der Eltern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Child Relations"
 msgstr "Child-Verknüpfungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5475 +5593 @@
 "Sie die zirkuläre Abhängigkeit behandeln?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
 msgid "Remove them, clean up relation"
 msgstr "Objekt entfernen und Verbindung lösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorieren und die aktuelle Verbindung belassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
 #, java-format
 msgid ""
@@ -5494 +5612 @@
 "<br><br>Wollen Sie es ein weiteres Mal in die Relation aufnehmen?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
 msgid "Multiple members referring to same primitive"
 msgstr "Mehrere Elemente verweisen auf das gleiche Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
 #, java-format
 msgid ""
@@ -5509 +5627 @@
 "Relation ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
 msgid "Add all primitives selected in the current dataset before the first member"
 msgstr ""
@@ -5515 +5633 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
 msgid "Add all primitives selected in the current dataset after the last member"
 msgstr ""
@@ -5521 +5639 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5529 +5647 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5537 +5655 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
 msgid "Relation Editor: Remove Selected"
 msgstr "Relations-Editor: Ausgewählte entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
 msgid "Select relation members which refer to primitives in the current selection"
 msgstr "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
 #, java-format
 msgid ""
@@ -5560 +5678 @@
 "Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
 msgid "Select primitives for selected relation members"
 msgstr "Objekte für gewählte Relationselemente auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
 msgid "Sort the relation members"
 msgstr "Relationselemente sortieren"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Relation Editor: Sort"
 msgstr "Relations-Editor: Sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Elemente nach oben schieben"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Relation Editor: Move Up"
 msgstr "Relations-Editor: Nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Elemente nach unten schieben"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Relation Editor: Move Down"
 msgstr "Relations-Editor: Nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Remove the currently selected members from this relation"
 msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Relation Editor: Remove"
 msgstr "Relations-Editor: Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
 msgid "Delete the currently edited relation"
 msgstr "Die aktuell bearbeitete Beziehung löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
 msgid "Yes, create a conflict and close"
 msgstr "Konflikt erstellen und schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#, fuzzy
+msgid "Click to create a conflict and close this relation editor"
+msgstr "Konflikt erstellen und schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
 msgid "No, continue editing"
 msgstr "Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+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:1066
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5622 +5749 @@
 "<br><br>Soll ein Konflikt erstellt und der Editor geschlossen werden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
 msgid "Conflict in data"
 msgstr "Datenkonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
 #, java-format
 msgid ""
@@ -5635 +5762 @@
 "Element<br>''{1}''.<br>Bitte lösen Sie diesen Konflikt zunächst auf.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
 msgid "Apply the current updates"
 msgstr "Aktualisierung übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
 msgid "Apply the updates and close the dialog"
 msgstr "Updates anwenden und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 msgid "Cancel the updates and close the dialog"
 msgstr "Updates abbrechen und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
 msgid "Add an empty tag"
 msgstr "Einen leeren Schlüssel hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Relation Editor: Download Members"
 msgstr "Relations-Editor: Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
 msgid "Sets a role for the selected members"
 msgstr "Definiert eine Rolle für die ausgewählten Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
 msgid "Apply Role"
 msgstr "Rolle anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
 #, java-format
 msgid ""
@@ -5682 +5809 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Yes, apply it"
 msgstr "Übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
 msgid "No, don't apply"
 msgstr "Nicht übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
 msgid "Confirm empty role"
 msgstr "Leere Rolle bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
@@ -5783 +5910 @@
 "Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang "
 "abgebrochen wurde. Die Fehlermeldung lautete: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+msgid "way is connected"
+msgstr "Weg ist verbunden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#, fuzzy
+msgid "way is connected to previous relation member"
+msgstr "Relationselemente sortieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#, fuzzy
+msgid "way is connected to next relation member"
+msgstr "Relationselemente sortieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgid "way is not connected to previous or next relation member"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -5985 +6130 @@
 msgstr "Kachelnummern"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:102
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "JOSM-Hilfeanzeiger"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information.You can both edit the <a href=\"{2}\">help topic in your "
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, java-format
+msgid ""
+"<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>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
 #, fuzzy, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Öffnen einer Verbindung zum entfernten Server<br>''{0}'' "
+"fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Die aktuelle Hilfeseite bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Die aktuelle Hilfeseite neu laden"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#, fuzzy
+msgid "Warning: bad location in HTML document. Exception was: "
 msgstr ""
 "Warnung: die Nachricht des Tages konnte nicht von ''{0}'' gelesen werden. "
 "Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:166
-msgid "JOSM Help Browser"
-msgstr "JOSM-Hilfeanzeiger"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:195
-#, java-format
-msgid "Error while loading page {0}"
-msgstr "Fehler beim Laden der Seite {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:223
-#, java-format
-msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-msgstr "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:226
-#, java-format
-msgid ""
-"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
-"\">your language</A>."
-msgstr ""
-"Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> oder <A HREF=\"{1}"
-"\">deutscher</A> Sprache erstellen."
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:241
-msgid "Open the current help page in an external browser"
-msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
-msgid "Edit the current help page"
-msgstr "Die aktuelle Hilfeseite bearbeiten"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:261
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Sie können nur die Hilfeseiten der JOSM-Onlinehilfe bearbeiten."
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:274
-msgid "Reload the current help page"
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+#, fuzzy
+msgid "Failed to open help page"
 msgstr "Die aktuelle Hilfeseite neu laden"
 
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:289
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:309
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:325
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:70
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
 msgid "Failed to read command. Exiting help browser. Exception was:"
 msgstr ""
@@ -7413 +7590 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
 msgid "Upload"
 msgstr "Hochladen"
@@ -7426 +7603 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:871
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Tags of new changeset"
 msgstr "Merkmale des neuen Änderungssatzes"
@@ -7436 +7613 @@
 msgstr "Merkmale im Änderungssatz nutzen, zu dem Hochgeladen wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271
 #, java-format
 msgid "{0} object to add:"
@@ -7455 +7632 @@
 msgstr[1] "{0} hinzugefügte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7462 +7639 @@
 msgstr[1] "{0} bearbeitete Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
 #, java-format
 msgid "{0} object to delete:"
@@ -7469 +7646 @@
 msgstr[1] "{0} zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474
 msgid "Upload the changed primitives"
 msgstr "Geänderte Objekte hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
 msgid "Illegal upload comment"
 msgstr "Ungültiger Kommentar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
 msgid "Cancel the upload and resume editing"
 msgstr "Hochladen abbrechend und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
 msgid "Upload all changes in one request"
 msgstr "Alle Änderungen in einer Anfrage hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -7501 +7678 @@
 "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:628
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
 msgid "Enter an upload comment (min. 3 characters)"
 msgstr "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
 msgid "Open a new changeset"
 msgstr "Neuen Änderungssatz öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:687
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
 msgid "Open a new changeset and use it in the next upload"
 msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693
 msgid "Use an open changeset"
 msgstr "Offenen Änderungssatz verwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
 msgid "Upload data to an already opened changeset"
 msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734
 msgid "Close changeset after upload"
 msgstr "Änderungssatz nach dem Hochladen schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:736
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
 msgid "Select to close the changeset after the next upload"
 msgstr "Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:927
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7540 +7717 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:967
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:966
 msgid "Load the list of your open changesets from the server"
 msgstr "Liste Ihrer offenen Änderungssätze vom Server laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:980
 msgid "Close the currently selected open changeset"
 msgstr "Ausgewählten offenen Änderungssatz schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1032
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
@@ -8934 +9111 @@
 msgstr "Objektvorlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:205
 msgid "Separator"
 msgstr "Trenner"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:351
 msgid "Toolbar"
 msgstr "Werkzeugleiste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:355
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Toolbar customization"
 msgstr "Werkzeugleistenanpassung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:395
 msgid "Customize the elements on the toolbar."
 msgstr "Die Elemente auf der Werkzeugleiste anpassen."
@@ -9128 +9305 @@
 msgstr "Auswahl in der Merkmalstabelle löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
 msgid "More information about this feature"
@@ -9134 +9311 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:521
-#, java-format
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:522
-#, java-format
-msgid "Use preset ''{0}''"
-msgstr "Verwende Vorlage \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "closedway"
 msgstr "geschlossener Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:649
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -9166 +9333 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:657
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente des Typs {0} werden unterstützt."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -9184 +9351 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:816
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
-#, java-format
-msgid "Preset group ''{0}'' of group ''{1}''"
-msgstr "Vorlagengruppe \"{0}\" aus Gruppe ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, java-format
-msgid "Preset group ''{0}''"
+#, fuzzy, java-format
+msgid "Preset group {1} / {0}"
+msgstr "Vorlagengruppe \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
+#, fuzzy, java-format
+msgid "Preset group {0}"
 msgstr "Vorlagengruppe \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9923 +10089 @@
 msgstr "Datensatz wird vorbereitet ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
 #, java-format
 msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
+#, fuzzy
+msgid "Downloading from OSM Server..."
+msgstr "Von OSM-Server herunterladen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
 msgid "Downloading referring ways ..."
 msgstr "Lade referenzierende Wege herunter..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
 msgid "Downloading referring relations ..."
 msgstr "Lade referenzierende Relationen herunter..."
@@ -10102 +10273 @@
 msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10109 +10280 @@
 "benötigt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
 #, java-format
 msgid ""
@@ -10117 +10288 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
-#, java-format
-msgid ""
-"Plugin {0} version {1} found but for this version of JOSM is at least "
-"version {2} required. Please update the plugin."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:146
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin nicht gefunden: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -10152 +10316 @@
 "Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
-#: ../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:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Keep plugin"
 msgstr "Plugin behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10176 +10340 @@
 "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, java-format
 msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
@@ -10187 +10351 @@
 "ausgelöst haben könnte."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
 msgid "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
@@ -10198 +10362 @@
 "Plugins, bevor Sie den Fehler melden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10210 +10374 @@
 "um das Plugin zu entfernen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
@@ -10216 +10380 @@
 "deaktiviert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
 msgid "Plugin information"
 msgstr "Plugin-Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -10428 +10592 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
-msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen abzuschließen.</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
@@ -10575 +10739 @@
 "Schwerwiegend: das Bild ''{0}'' konnte nicht geladen werden. Das ist ein "
 "schwerwiegendes Konfigurationsprobleme."
+
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#, java-format
+msgid ""
+"Warning: failed to derive wiki language prefix from JOSM locale code "
+"''{0}''. Using default code ''en''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -11301 +11472 @@
 msgstr "Fehler bei Datei {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11315 +11486 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11368 +11539 @@
 msgstr "Wähle aus..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11387 +11558 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
 #, java-format
 msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -11419 +11590 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
 msgid "Disable image cropping during georeferencing."
 msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
 msgid "Enable automatic caching."
 msgstr "Automatischen Zwischenspeicher aktivieren."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "Max. cache size (in MB)"
 msgstr "Max. Speichergröße (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -11447 +11618 @@
 "dieses Plugins erstellt wurden, hochladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid "French cadastre WMS"
 msgstr "Französisches Kataster-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "Source"
 msgstr "Quelle"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:210
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -11468 +11639 @@
 "Hintergrundfarbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -11476 +11647 @@
 "Nützlich für Texte auf dunklen Hintergründen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
 msgid "Allows multiple layers stacking"
 msgstr "Stapeln mehrerer Schichten erlauben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -11486 +11657 @@
 "durchsichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:123
 msgid "Vector images grab multiplier:"
 msgstr "Multiplikator für Vektordaten:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Fixed size square (default is 100m)"
 msgstr "Feste Quadratgröße (Standard ist 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:166
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Feste Größe (von 25 bis 1000 Meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175
 msgid "Raster images grab multiplier:"
 msgstr "Multiplikator für Pixelgrafiken:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194
+#. the crosspiece display
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#, fuzzy
+msgid "Display crosspieces:"
+msgstr "Koordinaten anzeigen als"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
@@ -11527 +11704 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:21
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
 msgid "Downloading {0}"
@@ -11534 +11711 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30
 msgid "Contacting WMS Server..."
 msgstr "Verbinde zu WMS-Server..."
@@ -11598 +11775 @@
 msgstr "Gebäudeumriss extrahieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 msgid "Download Image from French Cadastre WMS"
 msgstr "Bild vom französischen Kataster-WMS herunterladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Kataster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:40
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85
 msgid ""
@@ -11627 +11804 @@
 msgstr "Georeferenzierung wude unterbrochen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:99
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
 msgid ""
 "Click first corner for image cropping\n"
@@ -11635 +11818 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Image cropping"
 msgstr "Bild beschneiden"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
 msgid "Click second corner for image cropping"
 msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:208
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -11652 +11835 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Image georeferencing"
 msgstr "Bild georeferenzieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
 msgid ""
 "Do you want to cancel completely\n"
@@ -11669 +11852 @@
 "oder es erneut versuchen "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:261
 msgid "Enter cadastre east,north position"
 msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Achtung: Pfeil muss nach Norden zeigen!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "East"
 msgstr "Ost"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "North"
 msgstr "Nord"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:278
 #, java-format
 msgid "Set {0} Lambert coordinates"
 msgstr "Setze {0} Lambert-Koordinaten"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
-msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-msgstr "Lambert-Zone manuell setzen (z.B. für Orte zwischen Zonen)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
+msgid "Set manually the Lambert zone"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
 msgid "Zone"
 msgstr "Zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
 msgid "Lambert zone"
 msgstr "Lambert-Zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22
 msgid "Load location from cache (only if cache is enabled)"
 msgstr "Position aus dem Zwischenspeicher laden (nur wenn er aktiviert ist)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
+#, java-format
+msgid "{0} not allowed with the current projection"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Ort ändern"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Set a new location for the next request"
 msgstr "Für die nächste Anfrage eine neue Position setzen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
-msgid "Open a layer first (GPX, OSM, cache)"
-msgstr "Zuerst eine Ebene öffnen (GPX, OSM, cache)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Neue Ebene hinzufügen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
 #: build/trans_presets.java:2343
 msgid "Location"
 msgstr "Ort"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11735 +11919 @@
 "bekannte Syntax.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
 msgid "Add new layer"
 msgstr "Eine neue Ebene hinzufügen"
@@ -11763 +11947 @@
 msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:33
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
+msgid "Adjust WMS"
+msgstr "WMS justieren"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
+#, fuzzy
+msgid "Adjust the position of the WMS layer (raster images only)"
+msgstr "Die Position der gewählten WMS-Ebene anpassen"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgid ""
+"This mode works only if active layer is\n"
+"a cadastre \"plan image\" (raster image)"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
@@ -11777 +11977 @@
 "Bitte eine auswählen und erneut versuchen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
@@ -11783 +11983 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 #, java-format
 msgid ""
@@ -11816 +12016 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11827 +12027 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#, java-format
+msgid ""
+"Current layer is in Lambert CC9 Zone \"{0}\"\n"
+"where the commune is in Lambert CC9 Zone \"{1}\".\n"
+"Upload your changes, close all layers and change\n"
+"manually the Lambert zone from the Cadastre menu"
+msgstr ""
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -12637 +12846 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
-#, fuzzy
 msgid "Please select 4 ways that form a closed relation."
-msgstr "Bitte mindestens vier Knotenpunkte auswählen."
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
-#, fuzzy
 msgid "Unable to order the ways. Please verify their directions"
-msgstr "Kreuzungspunkt (via-node) konnte nicht gefunden werden. Prüfe deine Auswahl."
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
@@ -12668 +12875 @@
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
-#, fuzzy
 msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind"
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
-#, fuzzy
 msgid "Multipolygon must consist only of closed ways."
-msgstr "Auswahl darf nur aus Wegen bestehen."
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
-#, fuzzy
 msgid "You must select at least two ways."
-msgstr "Bitte mindestens einen Weg auswählen."
+msgstr ""
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13622 +13826 @@
 msgstr "\"{0}\" mit \"{1}\" ersetzen für"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
 msgid "Coastlines."
 msgstr "Küsten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
 msgstr "Dieser Test überprüft, ob die Küsten korrekt sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#, fuzzy
+msgid "Unconnected coastline"
+msgstr "Ungeordnete Küsten"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
+#, fuzzy
+msgid "Reversed coastline"
+msgstr "Ungeordnete Küsten"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
 msgid "Unordered coastline"
 msgstr "Ungeordnete Küsten"
@@ -13702 +13916 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
-#, fuzzy
 msgid "Missing name:* translation."
-msgstr "Fehlendes Argument für 'NICHT'."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -13722 +13935 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:62
 msgid "Nodes with same name"
 msgstr "Knoten mit demselben Namen"
@@ -14002 +14215 @@
 msgstr "Testen, ob kreisförmige Wege korrekt geschlossen sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
 #, java-format
 msgid "natural type {0}"
 msgstr "Naturflächentyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "landuse type {0}"
 msgstr "Landnutzungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "amenities type {0}"
 msgstr "Einrichtungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "sport type {0}"
 msgstr "Sportart {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "tourism type {0}"
 msgstr "Tourismustyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "shop type {0}"
 msgstr "Geschäftstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "leisure type {0}"
 msgstr "Erholungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "waterway type {0}"
@@ -14131 +14344 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -14145 +14358 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:107
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "Fläche"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:122
 msgid "Unclosed way"
 msgstr "Nicht geschlossener Weg"
@@ -14272 +14485 @@
 #, java-format
 msgid "Walking Papers: {0}"
+msgstr "Walking Papers: {0}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#, fuzzy
+msgid "Walking Papers"
 msgstr "Walking Papers: {0}"
 
@@ -14406 +14624 @@
 msgid "No valid WMS URL or id"
 msgstr "Keine gültige WMS-URL oder ID"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
-msgid "Adjust WMS"
-msgstr "WMS justieren"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
@@ -15615 +15829 @@
 #: build/trans_presets.java:1320 build/trans_presets.java:2469
 msgid "metal"
-msgstr "metall"
-
-#. color heath
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="wood"/>
-#. <icon src="misc/landmark/trees.png"/>
+msgstr "Metall"
+
 #: build/trans_presets.java:254 build/trans_presets.java:272
 #: build/trans_presets.java:291 build/trans_presets.java:306
@@ -15632 +15838 @@
 #: build/trans_presets.java:521 build/trans_presets.java:677
 #: build/trans_presets.java:1320 build/trans_presets.java:2469
-#: build/trans_style.java:3375
 msgid "wood"
-msgstr "Naturwald"
+msgstr "Holz"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
@@ -21264 +21469 @@
 #: build/trans_style.java:3249
 msgid "green"
-msgstr "Grün"
+msgstr "grün"
 
 #: build/trans_presets.java:2470
@@ -21273 +21478 @@
 msgid "blue"
 msgstr "blau"
+
+#: build/trans_presets.java:2470
+#, fuzzy
+msgid "gray"
+msgstr "Gras"
 
 #: build/trans_presets.java:2470
@@ -23127 +23337 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
-#. color wood
+#. color woodarea
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26283 +26493 @@
 msgstr "Heide"
 
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_style.java:3375
+msgid "woodarea"
+msgstr "Waldfläche"
+
 #. color water
 #. <scale_min>1</scale_min>