Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 19246)
+++ applications/editors/josm/i18n/po/de.po	(revision 19319)
@@ -6,4 +6,5 @@
 # Dirk Stöcker <openstreetmap@dstoecker.de>, 2008, 2009.
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -12,7 +13,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-31 15:00+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-03 16:00+0000\n"
+"Last-Translator: Andre Hinrichs <andre.hinrichs@gmx.de>\n"
 "Language-Team: Deutsch\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +21,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:20+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -120,5 +121,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -126,6 +127,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -137,9 +138,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -178,5 +179,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -204,11 +204,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
-msgstr "OpenStreetMap-Editor in Java"
+msgstr "Java-OpenStreetMap-Editor"
 
 #. Add the version number
@@ -303,4 +303,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Fortfahren"
@@ -331,5 +332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -345,7 +346,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -481,6 +485,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -559,5 +564,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -571,5 +576,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -770,15 +775,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Entfernen"
@@ -856,6 +861,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1511,14 +1516,15 @@
 msgstr[1] "zu {0} Objekten"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Seite für allgemeine Einstellungen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -1664,17 +1670,17 @@
 msgstr "Hilfe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusbericht"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "In die Zwischenablage kopieren und schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1823,29 +1829,29 @@
 msgstr "Dieser Knoten ist mit nichts verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Bitte wählen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Ein Knoten mit Merkmalen, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
@@ -1853,5 +1859,5 @@
 "oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1860,5 +1866,5 @@
 "verwendet werden, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1867,5 +1873,5 @@
 "werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1879,9 +1885,9 @@
 "und alle Knoten werden ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Knotenpunkte getrennt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1889,5 +1895,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2058,4 +2064,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Zurück"
@@ -3349,19 +3357,19 @@
 "Lesezeichen-Datei ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Einstellungen auf {0} gespeichert"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
@@ -3369,5 +3377,5 @@
 "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3378,5 +3386,5 @@
 "der Lesezeichen vom Server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3389,7 +3397,7 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+"Die Ressource ''{0}'' konnte nicht geladen werden. Die Fehlermeldung ist: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3601,4 +3609,6 @@
 "{0}"
 msgstr ""
+"Neuen Objekten kann keine Änderungssatznummer > 0 zugewiesen werden. "
+"Änderungssatznummer ist {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
@@ -3835,6 +3845,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -4004,5 +4014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4017,10 +4027,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "Straße"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -4028,15 +4038,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "Gewässer"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "Landfläche"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -4049,6 +4059,11 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Öffentliche Verkehrsmittel"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -4057,5 +4072,5 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4097,9 +4112,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Authentisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objekt gelöscht"
@@ -4129,4 +4154,6 @@
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Für den Parameter ''{0}'' wird ein nicht-leerer Wert benötigt (versucht "
+"wurde: ''{1}'')"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4207,65 +4234,65 @@
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Die Sprache festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4278,9 +4305,9 @@
 "wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4291,25 +4318,25 @@
 "--selection verwendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktualisierte Plugins aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4322,5 +4349,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4329,5 +4356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4437,5 +4464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Nutzer:"
@@ -5145,5 +5172,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5158,5 +5185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5164,5 +5191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5252,5 +5279,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "Kein"
@@ -5439,6 +5466,14 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
-msgstr ""
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>Die Wege, die zusammengefasst werden sollen, sind Mitglied einer oder "
+"mehrerer Relationen. Bitte entscheiden Sie, ob Sie diese Mitgliedschaften "
+"für den zusammengefassten Weg <strong>beibehalten</strong> oder "
+"<strong>auflösen</strong> möchten.<br />Standardmäßig wird die "
+"Mitgliedschaft des ersten Wegs <strong>beibehalten,</strong> und die "
+"Mitgliedschaft der weiteren Wege wird <strong>aufgelöst.</strong> Der "
+"zusammengefasste Weg tritt in der Relation an die Stelle des ursprünglichen "
+"ersten Wegs."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5449,6 +5484,14 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
-msgstr ""
+"the place of the original node in the relation.</html>"
+msgstr ""
+"<html>Die Knoten, die zusammengefasst werden sollen, sind Mitglied einer "
+"oder mehrerer Relationen. Bitte entscheiden Sie, ob Sie diese "
+"Mitgliedschaften für den zusammengefassten Knoten <strong>beibehalten</"
+"strong> oder <strong>auflösen</strong> möchten.<br />Standardmäßig wird die "
+"Mitgliedschaft des ersten Knotens <strong>beibehalten,</strong> und die "
+"Mitgliedschaft der weiteren Knoten wird <strong>aufgelöst.</strong> Der "
+"zusammengefasste Knoten tritt in der Relation an die Stelle des "
+"ursprünglichen ersten Knotens."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5484,4 +5527,7 @@
 "html>"
 msgstr ""
+"<html>Anwählen, um nur die Änderungssätze für gerade ausgewählte Objekte zu "
+"sehen.<br>Abwählen, um Änderungssätze für alle Objekte des aktuellen Layers "
+"zu sehen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
@@ -5546,5 +5592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5553,5 +5599,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5640,13 +5686,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Hinzufügen"
@@ -5779,33 +5825,33 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 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:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5814,21 +5860,21 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Mitglieder auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Alle Mitglieder der ausgewählten Relationen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Elemente herunterladen"
@@ -5923,4 +5969,6 @@
 "this system.</html>"
 msgstr ""
+"<html>URL konnte nicht erzeugt werden, weil die Zeichenkodierung "
+"''{0}''<br>auf diesem Computer nicht vorhanden ist.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
@@ -5989,5 +6037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
+msgstr "Lädt neue Daten für die ausgewählten Änderungssätze vom OSM-Server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -6013,4 +6061,7 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
+"<html>Sie haben keine Benutzerkennung eingestellt, daher kann JOSM Ihre</"
+"br>Änderungssätze nicht vom Server laden. Geben Sie Ihren </br>OSM-"
+"Benutzernamen in den Einstellungen an.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6069,4 +6120,6 @@
 msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Für den Parameter {0} wird ein positiver, ganzzahliger Wert benötigt. "
+"Angegeben wurde aber ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
@@ -6132,5 +6185,9 @@
 "''{0}''.</html>"
 msgstr[0] ""
+"<html>Das ausgewählte Objekt ist in der aktuellen Ebene<br />''{0}'' nicht "
+"verfügbar.</html>"
 msgstr[1] ""
+"<html>Keines der ausgewählten Objekte ist in der aktuellen<br />Ebene "
+"''{0}'' verfügbar.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -6151,5 +6208,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nichts zum zoomen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
@@ -7108,4 +7165,6 @@
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
+"Den Änderungssatz in der Detail-Ansicht aus dem lokalen Zwischenspeicher "
+"entfernen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
@@ -7118,4 +7177,6 @@
 "layer"
 msgstr ""
+"Die in diesem Änderungssatz bearbeiteten Objekte in der aktuellen Ebene "
+"auswählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -7126,4 +7187,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
+"<html>Keines der Objekte, die im Änderungssatz {0} bearbeitet wurden, ist "
+"in<br>aktuellen Ebene ''{1}'' verfügbar.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
@@ -7164,4 +7227,6 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
+"Den Änderungssatz mit der angegebenen Nummer inklusive bearbeiteter Objekte "
+"herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -7170,161 +7235,180 @@
 "> 0"
 msgstr ""
+"Dieser Wert ist keine gültige Nummer für einen Änderungssatz. Bitte geben "
+"Sie eine positive Ganzzahl ein."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+msgstr "Bitte geben Sie eine positive Ganzzahl ein"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgstr "Änderungssätze bestimmter Benutzer auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+msgstr "Änderungssätze auswählen, die offen oder geschlossen sind"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+msgstr "Änderungssätze nach Zeitraum auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+msgstr "Nur Änderungssätze eines bestimmten geografischen Bereichs auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+msgstr "Nur nach offenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+msgstr "Nur nach geschlossenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+msgstr "Nach offenen und geschlossenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgstr "Benutzername: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgstr "Nur meine eigenen Änderungssätze"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr "Nur Änderungssätze vom Nutzer mit der folgenden Benutzerkennung"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Nur Änderungssätze vom Nutzer mit folgendem Namen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+"Auswahl kann nicht auf eigene Änderungssätze begrenzt werden, weil keine "
+"Benutzerkennung eingegeben wurde."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr "Der Wert ''{0}'' für die Benutzerkennung ist ungültig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+"Auswahl kann nicht auf Änderungssätze des Benutzers ''{0}'' begrenzt werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr "Bitte eine gültige Benutzerkennung eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr "Bitte einen Nutzernamen eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr "Ungültiger Nutzername"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr "Datum: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+msgstr "Nur Änderungssätze, die nach diesem Zeitpunkt geschlossen wurden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+"Nur Änderungssätze, die vor einem bestimmten Zeitraum erstellt und "
+"geschlossen wurden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+"Kann keine Anfrage nach Änderungssätzen formulieren. Die Eingaben sind "
+"ungültig."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+"<html>Bitte geben Sie gültige Werte für Datum und Uhrzeit ein,<br />um die "
+"Anfrage auf einen Zeitbereich zu beschränken.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+msgstr "Ungültige Werte für Datum/Uhrzeit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+"Auswahl kann nicht auf geografischen Bereich begrenzt werden. Die Eingaben "
+"sind ungültig."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+"<html>Bitte geben Sie gültige Werte für die geografische Länge und Breite "
+"ein, um<br>die Änderungssatzanfrage auf diesen Bereich zu beschränken.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+msgstr "Ungültiges Koordinatenfenster"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+"Der Wert ist keine gültige Benutzernummer. Bitte geben Sie eine positive "
+"Ganzzahl ein."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+"<html>Der Wert ist kein gültiger Benutzername.<br />Bitte geben Sie einen "
+"Benutzernamen ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+msgstr "Bitte einen Nutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7332,6 +7416,8 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+"Bitte geben Sie das Datum im ortsüblichen Format an.<br>Beispiel: {0}"
+"<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7339,8 +7425,10 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
+"Bitte geben Sie die Uhrzeit im ortsüblichen Format an.<br>Beispiel: {0}"
+"<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Nur meine Änderungssätze herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7349,4 +7437,6 @@
 "include all changesets in the query.</html>"
 msgstr ""
+"<html>Anwählen, um nur eigene Änderungsgruppen abzufragen.<br>Abwählen, um "
+"alle Änderungsgruppen abzufragen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7356,20 +7446,23 @@
 "default query."
 msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Standard"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
-msgstr ""
+msgid "Download changesets using predefined queries"
+msgstr "Änderungssätze mit vorgefertigten Anfragen herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "von URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
-msgstr ""
+msgid "Query changesets from a server URL"
+msgstr "Änderungssätze mittels Server-URL herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
@@ -7379,62 +7472,67 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
-msgstr ""
+msgid "Use a custom changeset query"
+msgstr "Eine eigene Änderungssatzanfrage formulieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Änderungssätze abfragen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Änderungssätze abfragen und herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr ""
+msgstr "Bitte geben Sie einen URL mit einer gültigen Änderungssatzanfrage ein."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "Ungültiger URL für Änderungssatzanfrage"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Dialog schließen und Laden der Änderungssätze abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Änderungssätze werden gesucht und heruntergeladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Benzuternummer des aktuellen Benutzers herausfinden..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Änderungssätze suchen und herunterladen..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+msgstr "URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "Bitte geben Sie einen URL an, der eine Änderungssatzanfrage darstellt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "Beispiele"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Beachten Sie, dass Änderungssatzanfragen derzeit immer an ''{0}'' gerichtet "
+"werden, ungeachtet der Servernamen, Ports und Pfadangaben aus dem URL, den "
+"Sie unten eingeben."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7443,10 +7541,10 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7455,10 +7553,10 @@
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7467,5 +7565,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7474,9 +7572,9 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
@@ -7504,61 +7602,57 @@
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "{0} Relation löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr "Relation auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Es ist keine Relation ausgewählt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr "Relation in Hauptauswahl übernehmen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr "In Relationsliste auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Linienaussehen wählen"
+msgstr "Relation in Relationsliste auswählen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7616,5 +7710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7629,11 +7723,11 @@
 msgstr[1] "{0} unvollständige Kinder der Relation \"{1}\" herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "Relationen herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: Relation ''{2}'' herunterladen..."
 
@@ -7777,13 +7871,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Die Reihenfolge der Relationselemente umdrehen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
 msgid "Reverse"
-msgstr ""
+msgstr "Umkehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Relationseditor: Umkehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
@@ -8207,5 +8301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Class Type"
-msgstr ""
+msgstr "Klassentyp"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -8221,9 +8315,9 @@
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoomstufe"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
 msgid "Choose the server for searching:"
-msgstr ""
+msgstr "Folgenden Server für Suche benutzen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
@@ -8295,6 +8389,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8665,4 +8760,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
+"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil keine aktuelle "
+"Ebene definiert ist"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8672,4 +8769,6 @@
 "include such a primitive"
 msgstr ""
+"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil die aktuelle Ebene "
+"kein solches Objekt enthält"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -8815,5 +8914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "In einen neuen Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
@@ -8823,9 +8922,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "In einen existierenden Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Daten in einen existierenden und offenen Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
@@ -8883,4 +8982,6 @@
 "exception."
 msgstr ""
+"Warnung: Der Autorisierungsdialog wird wegen einer Java-"
+"Sicherheitseinschränkung möglicherweise nicht als oberstes Fenster gezeigt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -8910,4 +9011,6 @@
 "username and a valid password.</html>"
 msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8938,4 +9041,6 @@
 "the password may be transferred unencrypted.</html>"
 msgstr ""
+"<html>Warnung: Je nachdem, welche Autorisierungsmethode der Proxy-Server "
+"benutzt, wird das Kennwort möglicherweise unverschlüsselt übertragen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -8945,5 +9050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Mit dem angegebenen Benutzernamen und Kennwort anmelden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
@@ -9271,8 +9376,10 @@
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
+"Offene Änderungssätze verwalten und auswählen, zu welchem davon Änderungen "
+"hinzugefügt werden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Erweiterte Einstellungen konfigurieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:170
@@ -9280,5 +9387,5 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "Zu ''{0}'' hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:358
@@ -9333,4 +9440,5 @@
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
+"Objekte werden in einem <strong>neuen Änderungssatz</strong> hochgeladen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9340,16 +9448,19 @@
 "comment ''{1}''."
 msgstr ""
+"Objekte werden dem <strong>existierenden Änderungssatz</strong> {0} mit dem "
+"Kommentar ''{1}'' hinzugefügt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "Der Änderungssatz wird nach dem Hochladen <strong>geschlossen</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56
 msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
+msgstr "Der Änderungssatz bleibt nach dem Hochladen <strong>geöffnet</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
 msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 msgstr ""
+" (<a href=\"urn:changeset-configuration\">Änderungssatz konfigurieren</a>)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
@@ -9359,5 +9470,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"<strong>{0} Objekt</strong> wird <strong>einem Änderungssatz</strong> "
+"hinzugefügt"
 msgstr[1] ""
+"<strong>{0} Objekte</strong> werden <strong>einem Änderungssatz</strong> "
+"hinzugefügt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -9370,5 +9485,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"<strong>{0} Objekt</strong> wird <strong>einem Änderungssatz</strong> in "
+"<strong>einem Vorgang</strong> hinzugefügt"
 msgstr[1] ""
+"<strong>{0} Objekte</strong> werden <strong>einem Änderungssatz</strong> in "
+"<strong>einem Vorgang</strong> hinzugefügt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -9414,5 +9533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
 msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Klicken, um zum Hochladedialog zurückzukehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
@@ -9434,6 +9553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9450,5 +9569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
 msgid "Changeset is full"
-msgstr ""
+msgstr "Änderungssatz ist voll"
 
 #. we tried to delete an already deleted primitive.
@@ -9531,22 +9650,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
 msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr ""
+msgstr "Einen Änderungssatz füllen und zurück zum Hochlade-Dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "So viele Änderungssätze öffnen und benutzen, wie nötig sind"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
+msgstr "Hochladen in einem Vorgang nicht möglich (zu viele Objekte)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -9555,4 +9673,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -10011,24 +10136,24 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-Dateien (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10040,34 +10165,34 @@
 "dem Foto und wählen eine Zeitzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Fotozeit (aus EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-Zeit (aus obigem Photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Ich bin in der Zeitzone von: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Kein Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Ein anderes Foto öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Zeit von Foto und GPS-Empfänger synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -10077,114 +10202,116 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Bisher keine GPS-Daten geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPS-Spur: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Automatisch ermitteln"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgstr "Manuell justieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+msgstr "Vorschaubilder auf der Karte anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+msgstr "Keine GPS-Spur ausgewählt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Bilder mit GPS-Spur korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ungültiger Offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+msgstr "Erneut versuchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+msgstr "Es gibt keine passenden Bilder!"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zeitzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10195,21 +10322,21 @@
 "synchonisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Bilder enthalten keine Zeitinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10218,17 +10345,17 @@
 "andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Wählen Sie eine GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10239,5 +10366,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10248,56 +10375,56 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Eine der ausgewählten Dateien war nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Einlesen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10305,24 +10432,24 @@
 msgstr[1] "Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+msgstr "Bilddatei von der Platte löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "Bilddatei konnte nicht gelöscht werden."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
@@ -10352,5 +10479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Vorheriges Bild zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -10360,5 +10487,5 @@
 #, java-format
 msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geoimage: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
@@ -10368,5 +10495,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 msgid "Delete File from disk"
-msgstr ""
+msgstr "Datein von Platte löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
@@ -10377,5 +10504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
 msgid "Show next Image"
-msgstr ""
+msgstr "Nächstes Bild zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
@@ -10389,5 +10516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Dialog in die Seitenleiste verschieben"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
@@ -10512,9 +10639,596 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Ungültiges Strichelungsmuster - Werte müssen positiv sein"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autoren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Klicken, um das Vereinigen abzubrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Benutzername: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Kennwort:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Nach rechts drehen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Eigenschaften hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autoren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Benutzernamen Ihres OSM-Zugangs eingeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Zugang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Erweiterte Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Geben Sie einen Suchausdruck ein"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Klicken Sie um die aktuelle Aufgabe abzubrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Bitte mindestens einen Weg oder Knoten wählen."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Nichts gefunden für Suche ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Fenster schließen und Herunterladen abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Dialog schließen und neuen Knoten anlegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Mehrere Knoten von \"{0}\" abrufen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#, fuzzy
+msgid "Initializing a session at the OSM website..."
+msgstr "Initialisiere Relationen zum Aktualisieren ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, fuzzy, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "Übersetzung für Sprache ''{0}'' prüfen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Fehlendes erforderliches Attribut \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Verfügbare Stile von ''{0}'' laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Einstellungen hochladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Identifikation des Turms"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Details der Anfrage: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> wird momentan in Ebene ''{1}'' "
+"bearbeitet</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+#, fuzzy
+msgid "Go back to step 1/3"
+msgstr "Gehe zurück zum Hochladen-Dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Klicken, um Ziel zu entfernen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Notfallrettungspunkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Klicken, um Ziel zu entfernen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Zugang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Verbindung fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Der OSM-Server<br>''{0}''<br>hat einen internen Serverfehler gemeldet."
+"<br>Meist ist dies ein vorübergehendes Problem. Bitte versuchen Sie es "
+"später erneut.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "Zeichenkette;Zeichenkette;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10548,5 +11262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10554,5 +11268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10560,7 +11274,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die zu löschende Zeile."
@@ -11032,12 +11746,4 @@
 msgstr "OSM-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -11076,17 +11782,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Sprache"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "Verfügbare Übersetzungen suchen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Standard (Automatisch)"
@@ -11153,10 +11854,20 @@
 msgstr "Pluginquellen bearbeiten"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Dialog schließen und neuen Knoten anlegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Updates abbrechen und den Dialog schliessen"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11164,29 +11875,29 @@
 msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Verbindungseinstellungen zum OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Audio-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Einstellungen für den Audio-Player und Audio-Marken."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
@@ -11215,92 +11926,29 @@
 "benutzt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Authentisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Die Basis-URL des OSM Servers (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Benutzername (E-Mail) für den OSM-Server."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
-"soll."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Server Basis-URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM-Benutzername (E-Mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-Passwort"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11602,4 +12250,264 @@
 msgstr "Steuertastengruppen"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Ungültige URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</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/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Verbindung fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+#, fuzzy
+msgid "Use Basic Authentication"
+msgstr "Authentifizierung abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+#, fuzzy
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "Mit dem angegebenen Benutzernamen und Kennwort anmelden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Voreinstellungen verwenden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, fuzzy, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Sicherungsdateien erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-Benutzername (E-Mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-Passwort"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
+"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
+"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Server Basis-URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Prüfung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+#, fuzzy
+msgid "The API URL is valid."
+msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Aktueller Wert ist Standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Bitte JOSM neu starten."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr "Server:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr "Port:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+"Bitte geben Sie einen Benutzernamen und ein Kennwort an, wenn Ihr Proxy eine "
+"Anmeldung erwartet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr "Kennwort:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr "Kein Proxy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr "Standard-Systemeinstellungen nutzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr "HTTP-Proxy manuell konfigurieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr "SOCKS-Proxy nutzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11698,17 +12606,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
 msgid "Min. latitude"
-msgstr ""
+msgstr "Min. Breite"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
 msgid "Min. longitude"
-msgstr ""
+msgstr "Min. Länge"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
 msgid "Max. latitude"
-msgstr ""
+msgstr "Max. Breite"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
 msgid "Max. longitude"
-msgstr ""
+msgstr "Max. Länge"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
@@ -11717,4 +12625,6 @@
 "a bounding box)"
 msgstr ""
+"URL von www.openstreetmap.org (Sie können hier einen Download-URL "
+"hineinkopieren, um einen Bereich anzugeben)"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -11743,5 +12653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11763,4 +12673,5 @@
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"Der Wert {1} ist keine gültige geografische Länge für den Parameter ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
@@ -11768,4 +12679,5 @@
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"Der Wert {1} ist keine gültige geografische Breite für den Parameter ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
@@ -11789,29 +12701,37 @@
 "and ''display_name''"
 msgstr ""
+"Änderungssatzanfragen, die sowohl die Parameter ''uid'' als auch "
+"''display_name'' enthalten, sind nicht möglich"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+msgstr "Nicht unterstützter Parameter ''{0}'' in der Änderungssatzanfrage"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11820,16 +12740,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11837,5 +12757,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11843,5 +12763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11852,10 +12772,10 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr ""
+msgstr "Server-Antwort wird verarbeitet..."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Unerwartetes XML-Element mit dem Namen ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
@@ -12079,5 +12999,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -12125,5 +13045,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -12171,15 +13091,14 @@
 msgstr "OK - erneuter Versuch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Starte Wiederholung {0} von {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-"Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -12188,5 +13107,5 @@
 "ist {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -12195,11 +13114,11 @@
 "erhalten."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12372,4 +13291,21 @@
 msgstr "Liste der Änderungssätze einlesen..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12624,5 +13560,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
 msgid "Reading changesets..."
-msgstr "Änderungssetze einlesen..."
+msgstr "Änderungssätze einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
@@ -12694,24 +13630,29 @@
 "Internetverbindung."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Das XML-Element <user> fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Das Attribut ''{0}'' des XML-Elements ''{1}'' fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 "Ungültiger Wert \"{2}\" für das Attribut ''{0}'' des XML-Elements ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Änderungssatz {0} einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -13113,5 +14054,5 @@
 msgstr "Parameter ''{0}'' vom Typ Knoten erwartet, aber ''{1}'' erhalten"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -13123,5 +14064,5 @@
 "Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -13135,5 +14076,5 @@
 "{0} und laden Sie erneut hoch.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -13146,5 +14087,34 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -13155,5 +14125,5 @@
 "<br> weil der Änderungssatz bereits geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -13164,5 +14134,5 @@
 "<br> weil der Änderungssatz bereits am {1} geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -13173,9 +14143,9 @@
 "Fehlermeldung ist:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Der Server hat einen Konflikt identifiziert.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -13186,5 +14156,5 @@
 "er bereits {1} geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -13197,5 +14167,5 @@
 "Applet<br>nicht von ''{1}'' geladen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -13206,5 +14176,5 @@
 "fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -13215,5 +14185,5 @@
 "Herunterladen.<br>Details: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -13225,10 +14195,10 @@
 "später erneut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage. <br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13240,10 +14210,10 @@
 "Datenbankexport."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Fehlermeldung (englisch): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13258,5 +14228,5 @@
 "<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13270,5 +14240,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13284,18 +14254,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr "Verfügbare Übersetzungen suchen..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr "Übersetzungen prüfen..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr "Übersetzung für Sprache ''{0}'' prüfen"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13332,4 +14289,10 @@
 "Spracheinstellungen ''{0}'' abgeleitet werden. Die Standardspracheinstellung "
 "''en'' wird benutzt."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -13742,5 +14705,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
@@ -13793,5 +14756,11 @@
 msgstr "CadastreGrabber: Ungültige URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13802,25 +14771,23 @@
 "oder Aktion abgebrochen"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Wähle aus..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Wähle eine Kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Wähle aus..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13833,13 +14800,13 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 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:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13849,34 +14816,34 @@
 "Fehlermeldung ist: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Originale Hintergrundfarbe durch JOSM-Farbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Graue Farben invertieren (für schwarze Hintergründe)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Transparenten Hintergrund aktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Automatischen Zwischenspeicher aktivieren."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. Speichergröße (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13894,19 +14861,19 @@
 "dieses Plugins erstellt wurden, hochladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Französisches Kataster-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 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:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Quelle"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13916,5 +14883,5 @@
 "Hintergrundfarbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13924,9 +14891,9 @@
 "Nützlich für Texte auf dunklen Hintergründen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Stapeln mehrerer Schichten erlauben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13934,36 +14901,36 @@
 "durchsichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 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:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "Multiplikator für Vektordaten:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 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:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Feste Quadratgröße (Standard ist 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 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:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "Multiplikator für Pixelgrafiken:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr "Anzeige der Querstücke:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -14086,5 +15053,5 @@
 "Wollen Sie sie benutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -14094,14 +15061,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Bild beschneiden"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 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:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -14111,14 +15078,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "Bild georeferenzieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 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:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -14128,21 +15095,21 @@
 "oder es erneut versuchen "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Achtung: Pfeil muss nach Norden zeigen!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Ost"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Nord"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -14261,28 +15228,28 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, 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:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -14294,9 +15261,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14305,38 +15272,38 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Verwenden"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Bitte auswählen, welches Farbschema verwendet werden soll."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Farbschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Bitte auswählen, welches Farbschema gelöscht werden soll."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Das in der Liste gewählte Schema verwenden."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Die aktuellen Farben als neues Farbschema speichern."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Das ausgewählte Farbschema aus der Liste löschen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Farbschemata"
@@ -14501,6 +15468,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -14730,33 +15697,33 @@
 msgstr "Ein unbekannter Fehler ist aufgetreten"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "Ost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "Nordost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "Nordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "West"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "Südwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "Süd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "Südost"
@@ -14796,5 +15763,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14805,81 +15772,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "Wasser"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "Küstenlinie"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "Land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximale Anzahl von Abschnitten je Weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximale Anzahl von Knoten in der Anfangs-Spur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Höchster Grauwert, der als Wasser betrachtet wird (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Genauigkeit beim Vereinfachen von Linien (Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Auflösung der Landsat-Kacheln (Pixel pro Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Größe der Landsat-Kacheln (Pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle Spuren nach Osten verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle Spuren nach Norden verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Richtung, in der nach Land gesucht werden soll"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Wege bezeichnen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-Ebene"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximale Speichergröße (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximales Speicheralter (Tage)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Datenquelle"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14889,5 +15856,5 @@
 "Linien vereinfacht werden). Standardwert ist 50.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14897,5 +15864,5 @@
 "Landsat IR-1-Daten). Erlaubter Bereich ist 0-255. Standard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14906,5 +15873,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14913,21 +15880,21 @@
 "4.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Größe der Landsat-Kacheln, gemessen in Pixeln. Standard ist 2.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle Punkte nach Osten verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle Punkte nach Norden verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Richtung in der nach Land gesucht werden soll. Standardmäßig Ost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14935,26 +15902,26 @@
 "Wasser."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Zum Abzeichnen genutzte WMS-Ebene. Standard ist IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Name der Datenquelle. Standardeinstellung ist Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Ein Plugin, um Wasserflächen auf Landsat-Bildern zu kennzeichnen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Einstellungen für das LakeWalker-Plugin"
@@ -15172,5 +16139,5 @@
 msgstr "OpenStreetBugs Lade-Warteschleife"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-Einträge anzeigen"
@@ -15201,5 +16168,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -15216,10 +16182,14 @@
 "umgewandelt werden"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs öffnen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
@@ -15227,5 +16197,9 @@
 "Herunterladen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -15235,22 +16209,32 @@
 "OpenStreetBugs abzurufen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+#, fuzzy
+msgid "Queue"
+msgstr "Abfrage"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Kommentar hinzufügen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Geben Sie einen Kommentar ein"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Kommentar:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Problem als erledigt markieren"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Wirklich schließen?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -15260,23 +16244,51 @@
 "optionalen Kommentar angeben:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Schließen"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Neuer Fehler"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Fehler anlegen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Beschreiben Sie den Fehler möglichst genau"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Erstellt"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Bitte einen Benutzernamen angeben"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Unbekannter Status des Fehlers"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs öffnen"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15298,10 +16310,10 @@
 msgstr "Dateiendung unbekannt: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15311,5 +16323,5 @@
 "den Pfad zu Firefox ein."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-Programm"
@@ -15319,37 +16331,37 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "Daten vom API herunterladen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "Erstelle neue Objekte"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "Auswahl ändern"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "Ansicht wechseln"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle Fernsteueraktionen manuell bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Fernbedienung"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Einstellungen für das Fernbedienungs-Plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15361,5 +16373,5 @@
 "Anwendungen adressiert werden muss, die das Plugin nutzen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Erlaubte Aktionen"
@@ -15475,25 +16487,25 @@
 msgstr "Route löschen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Einstellungen des Routenführungsplugins"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Routenführung konfigurieren."
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Straßentyp"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Geschwindigkeit (km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Gewicht"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Gewichtswerte eingeben"
@@ -15539,42 +16551,42 @@
 msgstr "Bild "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "Automatisch Zoomen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "Kacheln automatisch laden"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Einstellungen für das Karten-Plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Quellen der Kacheln"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Automatisches Zoomen: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Kacheln automatisch laden: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "Min. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Hintergrund ausblenden: "
@@ -15810,38 +16822,38 @@
 " \"{1}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Ignorierliste verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Ignorierliste zum Unterdrücken von Warnungen verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Fehlerebene verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Fehlerebene verwenden, um problematische Elemente anzuzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Unwichtige Warnungen beim Hochladen anzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Auf Anforderung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Beim Hochladen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15850,5 +16862,5 @@
 "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Datenprüfungs-Plugin"
@@ -16470,5 +17482,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "Gebäude"
@@ -16482,5 +17494,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "Fläche"
@@ -16914,55 +17926,55 @@
 msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Einstellungen für WMS-Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menüname"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Ausgewählte Standardwerte kopieren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Herunterladeprogramm:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Kacheln überlappen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "Ost-West (%):"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "Nord-Süd (%):"
@@ -18552,6 +19564,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobahn"
@@ -18577,6 +19589,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "Schnellstraße"
@@ -18602,6 +19614,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "Bundesstraße"
@@ -18627,6 +19639,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "Landesstraße"
@@ -18640,5 +19652,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "Kreisstraße"
@@ -18656,5 +19668,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "Ortsstraße"
@@ -18688,6 +19700,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "Service"
@@ -18721,6 +19733,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "Baustelle"
@@ -18770,5 +19782,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -19754,5 +20766,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "Marsch"
@@ -21151,7 +22163,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "Straße"
@@ -21879,28 +22891,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "Sport"
@@ -23595,4 +24607,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23627,9 +24647,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "grün"
@@ -25037,7 +26057,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "Fahrrad"
@@ -25107,7 +26127,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "Fuß"
@@ -25133,5 +26153,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "U-Bahn"
@@ -25427,5 +26447,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "veraltet"
@@ -25467,5 +26487,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "Pferd"
@@ -25575,4 +26595,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25610,5 +26636,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25681,11 +26707,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "Barriere"
@@ -25748,5 +26774,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "Autostraße"
@@ -25802,7 +26828,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "Weg"
@@ -25873,9 +26899,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "Eisenbahn"
@@ -25967,5 +26993,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "Service"
@@ -25979,5 +27005,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "Furt"
@@ -25998,10 +27024,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "Wendekreis"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26011,5 +27037,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "Notfallrettungspunkt"
@@ -26024,5 +27050,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "Flussufer"
@@ -26036,5 +27062,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "Fluss"
@@ -26048,5 +27074,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "Dock"
@@ -26235,13 +27261,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -26303,7 +27329,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -26326,10 +27352,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -26365,7 +27391,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -26411,6 +27437,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "Rollweg"
@@ -26424,5 +27450,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "Terminal"
@@ -26444,5 +27470,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -26456,5 +27482,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -26516,7 +27542,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "Luftweg"
@@ -26533,5 +27559,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -26546,5 +27572,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -26559,5 +27585,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "Fortgeschrittenenpiste"
@@ -26572,5 +27598,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "Expertenpiste"
@@ -26585,5 +27611,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -26598,5 +27624,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -26716,11 +27742,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "Strom"
@@ -26734,5 +27760,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -26746,5 +27772,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "Pipeline"
@@ -26888,13 +27914,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "Freizeit"
@@ -26908,5 +27934,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "Jachthafen"
@@ -27002,10 +28028,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -27107,14 +28133,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27510,5 +28543,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27533,23 +28566,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -27581,6 +28614,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -27641,8 +28674,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "Gesundheit"
@@ -27995,26 +29028,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "Geschäft"
@@ -28086,8 +29119,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "Hotel"
@@ -28158,5 +29191,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28165,5 +29198,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -28173,5 +29206,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28180,5 +29213,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28188,9 +29221,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "Tourismus"
@@ -28278,14 +29311,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "Historisch"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28294,5 +29326,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "Steinbruch"
@@ -28306,5 +29338,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -28326,5 +29358,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "Wasserbecken"
@@ -28338,5 +29370,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "Forst"
@@ -28350,5 +29382,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "Farmland"
@@ -28371,5 +29403,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -28383,5 +29415,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -28395,5 +29427,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "Baulücke"
@@ -28407,5 +29439,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "Bauland"
@@ -28419,5 +29451,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -28474,7 +29506,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "Militär"
@@ -28488,5 +29520,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "Friedhof"
@@ -28499,5 +29531,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "Berggipfel"
@@ -28512,5 +29544,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "Gletscher"
@@ -28524,5 +29556,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "Vulkan"
@@ -28577,8 +29609,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "Natur"
@@ -28592,5 +29624,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "Buschland"
@@ -28604,5 +29636,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "Heide"
@@ -28616,5 +29648,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -28628,5 +29660,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -28640,5 +29672,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "Strand"
@@ -28716,8 +29748,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "Route"
@@ -28740,4 +29772,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28765,7 +29838,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "Grenze"
@@ -28915,11 +29993,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "Ort"
@@ -28967,6 +30045,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "Adresse"
@@ -29322,4 +30400,25 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "Verfügbare Übersetzungen suchen..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Die Basis-URL des OSM Servers (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Benutzername (E-Mail) für den OSM-Server."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
+#~ "soll."
+
+#~ msgid "Loading available locales..."
+#~ msgstr "Verfügbare Übersetzungen suchen..."
+
+#~ msgid "Checking locales..."
+#~ msgstr "Übersetzungen prüfen..."
+
 #~ msgid "Load Selection"
 #~ msgstr "Auswahl laden"
@@ -29356,4 +30455,8 @@
 #~ "diesem System nicht verfügbar ist.</hml>"
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr ""
+#~ "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kann \"{0}\" nicht lesen"
@@ -29366,4 +30469,8 @@
 #~ "Ein Kommando konnte nicht gelesen werden. Der Hilfe-Browser wird "
 #~ "geschlossen. Die Fehermeldung war:"
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr ""
+#~ "Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
 
 #~ msgid ""
