Index: utils/josm/plugins/lang-de/de.po
===================================================================
--- utils/josm/plugins/lang-de/de.po	(revision 1471)
+++ utils/josm/plugins/lang-de/de.po	(revision 1476)
@@ -1,3 +1,4 @@
 # translation of de.po to 
+# translation of de.po to
 # Sven Anders <s.anders@digitec.de>, 2006.
 # Sven Anders <sven@anders-hamburg.de>, 2006.
@@ -7,5 +8,5 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-13 23:04+0200\n"
-"PO-Revision-Date: 2006-09-10 14:21+0200\n"
+"PO-Revision-Date: 2006-10-14 20:38+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -100,5 +101,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
 msgid "Move around objects that are under the mouse or selected."
-msgstr ""
+msgstr "Objekte die sich unter der Maus befinden oder ausgewählt sind verschieben"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
@@ -116,6 +117,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
-msgid ""
-"Warning: This way is incomplete. Try to download it, before adding segments."
+msgid "Warning: This way is incomplete. Try to download it, before adding segments."
 msgstr ""
 "Achtung: Dieser Weg ist nicht vollständig. Er sollte vom Server geladen "
@@ -145,6 +145,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Do you want to add all other selected segments to the one selected way?"
-msgstr ""
-"Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
+msgstr "Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
@@ -196,7 +195,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
 msgid "Raw GPS data"
-msgstr "Hole GPS-Daten"
+msgstr "Roh GPS-Daten"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
@@ -205,7 +203,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-#, fuzzy
 msgid "OpenStreetMap data"
-msgstr "Java OpenStreetMap - Editor "
+msgstr "OpenStreetMap Daten"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
@@ -277,38 +274,35 @@
 #, java-format
 msgid "Executing {0}"
-msgstr ""
+msgstr "Erledige {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
 msgid "The Tool requires some data to be loaded."
-msgstr ""
+msgstr "Für das Werkzeug ist es nötig das Daten geladen sind."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, fuzzy, java-format
+#, java-format
 msgid "Could not execute command: {0}"
-msgstr "Kann \"{0}\" nicht lesen."
+msgstr "Kann \"{0}\" nicht ausführen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
 msgid "Tools"
-msgstr ""
+msgstr "Werkzeuge"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-#, fuzzy
 msgid "Could not read external tool configuration."
-msgstr "Kann das Format nicht ermitteln."
+msgstr "Kann die externen Werkzeugeinstellungen nicht lesen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
 msgid "Align Nodes in Circle"
-msgstr ""
+msgstr "Knotenpunkte im Kreis anordnen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#, fuzzy
 msgid "Move the selected nodes into a circle."
-msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
+msgstr "Gewählte Punkte auf eine Kreisform bringen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
 msgid "Please select at least four nodes."
-msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+msgstr "Bitte wählen Sie mindestens vier Punkte aus."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
@@ -371,7 +365,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-#, fuzzy
 msgid "Download the following data:"
-msgstr "Lade Daten aus dem Internet"
+msgstr "Lade die folgenden Daten aus dem Internet:"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
@@ -412,11 +405,9 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
 msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr ""
-"Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
+msgstr "Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-#, fuzzy
 msgid "Please select at least one download data type."
-msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+msgstr "Bitte wählen Sie mindestens einen Quelle zum laden aus."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
@@ -460,7 +451,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-#, fuzzy
 msgid "News about JOSM"
-msgstr "Über JOSM..."
+msgstr "Neues über JOSM..."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
@@ -617,5 +607,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104
 msgid "Can only edit help pages from JOSM Online Help"
-msgstr ""
+msgstr "Kann nur Hilfeseite von JOSM Online Hilfe bearbeiten."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
@@ -635,12 +625,11 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
-#, fuzzy
 msgid "Please select an incomplete way."
-msgstr "Bitte eine Farbe wählen."
+msgstr "Bitte einen unvollständigen Weg auswählen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Download {0} incomplete ways?"
-msgstr "Unvollständige Objekte nachladen?"
+msgstr "{0} unvollständige Wege nachladen?"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
@@ -752,4 +741,7 @@
 "This message will not shown again until JOSM is restarted."
 msgstr ""
+"Das Plugin {0} ist auf die Ausnahmebedingung (Exception) gestoßen: {1}\n"
+"Vielleicht ist es veraltet? Bitte nehmen Sie Kontakt mit dem Plugin Autor auf.\n"
+"Diese Meldung erscheint erst wieder mit dem nächsten Neustart des Programmes."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
@@ -811,7 +803,7 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
+#, java-format
 msgid "An error occoured in plugin {0}"
-msgstr "Beim Speichern ist ein Fehler aufgetreten."
+msgstr "Ein Fehler ist im Plugin {0} aufgetreten."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
@@ -896,6 +888,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Öffnet eine Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
+msgstr "Öffnet eine Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
@@ -904,6 +895,5 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
-msgid ""
-"Set the selected elements on the map to the selected items in the list above."
+msgid "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 "Setze die gewählten Elemente auf der Karte auf die obige Liste der "
@@ -988,6 +978,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
-msgid ""
-"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+msgid "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
 msgstr ""
 "Bitte geben Sie einen neuen Wert für \"{0}\" an.<br>(Leereingabe löscht den "
@@ -1007,6 +996,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "Please select objects for which you want to change properties."
-msgstr ""
-"Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
+msgstr "Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
@@ -1125,6 +1113,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
 #, java-format
-msgid ""
-"display_values ({0}) and values ({1}) must be of same number of elements."
+msgid "display_values ({0}) and values ({1}) must be of same number of elements."
 msgstr ""
 "display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
@@ -1389,6 +1376,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr ""
-"Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
+msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
@@ -1570,6 +1556,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
-"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
@@ -1585,6 +1570,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr ""
-"Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
+msgstr "Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
@@ -1605,6 +1589,5 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
+msgid "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -1654,6 +1637,5 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
+msgid "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM Server. Leer lassen, wenn kein Passwort gespeichert "
@@ -1717,6 +1699,5 @@
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr ""
-"Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
+msgstr "Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
@@ -1780,13 +1761,13 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Configure available Plugins."
-msgstr ""
+msgstr "Verfügbare Plugins konfigurieren."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
 msgid "Get more plugins"
-msgstr ""
+msgstr "Mehr Plugins holen"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
@@ -1870,6 +1851,5 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgid "Format string is incomplete. Need at least 'lat' and 'lon' specification"
 msgstr ""
 "Die Format -Zeile ist unvollständig. Brauche mindestens 'lat' und 'lon' "
@@ -1913,10 +1893,10 @@
 #, java-format
 msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr ""
+msgstr "Daten-Fehler: Abschnit {0} ist gelöscht aber teil des Wegs {1}."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
 #, java-format
 msgid "Data error: Node {0} is deleted but part of Segment {1}"
-msgstr ""
+msgstr "Daten-Fehler: Knotenpunkt {0} ist gelöscht, aber Teil des Abschnittes {1}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
@@ -2031,10 +2011,10 @@
 #, java-format
 msgid "Plugin not found: {0}."
-msgstr ""
+msgstr "Plugin nicht gefunden: {0}."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, fuzzy, java-format
+#, java-format
 msgid "Could not load plugin {0}."
-msgstr "Kann \"{0}\" nicht lesen."
+msgstr "Kann das Plugin {0}nicht laden."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
@@ -2061,13 +2041,11 @@
 #: ../osmarender/src/OsmarenderPlugin.java:108
 msgid "View"
-msgstr ""
+msgstr "Bild"
 
 #: ../landsat/src/landsat/DownloadLandsatTask.java:18
-#, fuzzy
 msgid "Landsat background images"
-msgstr "Lade und zeige Satelietenbilder als Hintergrund."
+msgstr "Landsat Hintergundbilder."
 
 #: ../landsat/src/landsat/LandsatLayer.java:45
-#, fuzzy
 msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
 msgstr ""
@@ -2088,5 +2066,5 @@
 "Open the annotation preset test tool for previewing annotation preset "
 "dialogs."
-msgstr ""
+msgstr "Statret den Voreinstellungsquellen Test Werkzeug um diese aus zu probieren."
 
 #: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
@@ -2096,31 +2074,2 @@
 "werden."
 
-#~ msgid "Download {0} ways containing a total of {1} segments?"
-#~ msgstr "Lade {0} Wege, die aus {1} Abschnitten bestehen?"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Auswahlliste aktualisieren."
-
-#~ msgid "Search for objects."
-#~ msgstr "Objekte suchen."
-
-#~ msgid "Language"
-#~ msgstr "Sprache"
-
-#~ msgid "Conflicts in disjunct objects"
-#~ msgstr "Konflikte in unabhängigen Objekten"
-
-#~ msgid "Downloading {0} {1}"
-#~ msgstr "Hole {0} {1}"
-
-#~ msgid "Got more than one object when expecting only one."
-#~ msgstr "Habe ein Objekt erwartet, aber mehrere empfangen."
-
-#~ msgid "Move selected objects around."
-#~ msgstr "Verschiebe markierte Objekte"
-
-#~ msgid "Open as raw gps data"
-#~ msgstr "Als GPS-Daten öffnen"
-
-#~ msgid "Show background"
-#~ msgstr "Hintergrund anzeigen"
Index: utils/josm/plugins/lang-en_GB/en_GB.po
===================================================================
--- utils/josm/plugins/lang-en_GB/en_GB.po	(revision 1471)
+++ utils/josm/plugins/lang-en_GB/en_GB.po	(revision 1476)
@@ -1,10 +1,7 @@
-# British English translation of JOSM.
-# Copyright (C) 2006 JOSM'S COPYRIGHT HOLDER
+# English (British) translation of JOSM.
+# Copyright (C) 2006 Immanuel Scholz
 # This file is distributed under the same license as the JOSM package.
 # Bruce Cowan <bruce.cowan@dsl.pipex.com>, 2006.
-# , fuzzy
-# Bruce Cowan <bruce.cowan@dsl.pipex.com>, 2006.
-# 
-# 
+#
 msgid ""
 msgstr ""
@@ -12,5 +9,5 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-13 23:16+0200\n"
-"PO-Revision-Date: 2006-07-22 16:18+0100\n"
+"PO-Revision-Date: 14/10/2006 18:36+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
 "Language-Team: English/GB <josm-en_gb@eigenheimstrasse.de>\n"
@@ -18,5 +15,5 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
@@ -67,5 +64,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
 msgid "Segments are part of different ways."
-msgstr ""
+msgstr "Segments are part of different ways."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
@@ -104,5 +101,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
 msgid "Move around objects that are under the mouse or selected."
-msgstr ""
+msgstr "Move around objects that are under the mouse or selected."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
@@ -126,20 +123,14 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} way has been selected.\n"
 "Do you wish to select all segments belonging to the way instead?"
-msgid_plural ""
 "{0} ways have been selected.\n"
 "Do you wish to select all segments belonging to the ways instead?"
-msgstr[0] ""
+msgstr ""
 "{0} way has been selected.\n"
-"Do you wish to select all segments belonging to the way instead?{0} ways "
-"have been selected.\n"
-"Do you wish to select all segments belonging to the ways instead?"
-msgstr[1] ""
-"{0} way has been selected.\n"
-"Do you wish to select all segments belonging to the way instead?{0} ways "
-"have been selected.\n"
+"Do you wish to select all segments belonging to the way instead?"
+"{0} ways have been selected.\n"
 "Do you wish to select all segments belonging to the ways instead?"
 
@@ -166,9 +157,9 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
-#, fuzzy, java-format
+#, java-format
 msgid "Create a new way out of {0} segment?"
 msgid_plural "Create a new way out of {0} segments?"
 msgstr[0] "Create a new way out of {0} segment?"
-msgstr[1] "Create a new way out of {0} segment?"
+msgstr[1] "Create a new way out of {0} segments?"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
@@ -201,7 +192,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
 msgid "Raw GPS data"
-msgstr "Downloading GPS data"
+msgstr "Raw GPS data"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
@@ -210,7 +200,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-#, fuzzy
 msgid "OpenStreetMap data"
-msgstr "Java Open Street Map - Editor"
+msgstr "OpenStreetMap data"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
@@ -230,17 +219,14 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
-#, fuzzy
 msgid "Reverse Segments"
-msgstr "segments"
+msgstr "Reverse Segments"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#, fuzzy
 msgid "Revert the direction of all selected Segments."
-msgstr "Wrong direction of segments."
+msgstr "Revert the direction of all selected Segments."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
-#, fuzzy
 msgid "Please select at least one segment."
-msgstr "Please select the row to delete."
+msgstr "Please select at least one segment."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
@@ -285,52 +271,49 @@
 #, java-format
 msgid "Executing {0}"
-msgstr ""
+msgstr "Executing {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
 msgid "The Tool requires some data to be loaded."
-msgstr ""
+msgstr "The Tool requires some data to be loaded."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, fuzzy, java-format
+#, java-format
 msgid "Could not execute command: {0}"
-msgstr "Could not read \"{0}\""
+msgstr "Could not execute command: {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
 msgid "Tools"
-msgstr ""
+msgstr "Tools"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-#, fuzzy
 msgid "Could not read external tool configuration."
-msgstr "Could not detect data format string."
+msgstr "Could not read external tool configuration."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
 msgid "Align Nodes in Circle"
-msgstr ""
+msgstr "Align Nodes in Circle"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#, fuzzy
 msgid "Move the selected nodes into a circle."
-msgstr "Merge the selected layer into the layer directly below."
+msgstr "Move the selected nodes into a circle."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
 msgid "Please select at least four nodes."
-msgstr "Please select the row to delete."
+msgstr "Please select at least four nodes."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
 msgid "Rename layer"
-msgstr ""
+msgstr "Rename layer"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
 msgid "Also rename the file"
-msgstr ""
+msgstr "Also rename the file"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename the file \"{0}\"."
-msgstr "Could not read \"{0}\""
+msgstr "Could not rename the file \"{0}\"."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
@@ -379,7 +362,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-#, fuzzy
 msgid "Download the following data:"
-msgstr "Downloading data"
+msgstr "Download the following data:"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
@@ -423,7 +405,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-#, fuzzy
 msgid "Please select at least one download data type."
-msgstr "Please select the row to delete."
+msgstr "Please select at least one download data type."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
@@ -454,7 +435,7 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Java Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
+msgstr "Java Version {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
@@ -467,7 +448,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-#, fuzzy
 msgid "News about JOSM"
-msgstr "About JOSM..."
+msgstr "News about JOSM"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
@@ -485,7 +465,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-#, fuzzy
 msgid "Contribution"
-msgstr "Connection"
+msgstr "Contribution"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
@@ -557,12 +536,10 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
 msgid "Save as"
-msgstr "Save"
+msgstr "Save as"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
 msgid "Save the current data to a new file."
-msgstr "Save the current data."
+msgstr "Save the current data to a new file."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
@@ -625,11 +602,11 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104
 msgid "Can only edit help pages from JOSM Online Help"
-msgstr ""
+msgstr "Can only edit help pages from JOSM Online Help"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading {0} segment"
 msgid_plural "Downloading {0} segments"
-msgstr[0] "Downloading {0} segments"
+msgstr[0] "Downloading {0} segment"
 msgstr[1] "Downloading {0} segments"
 
@@ -643,12 +620,11 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
-#, fuzzy
 msgid "Please select an incomplete way."
-msgstr "Please select a colour."
+msgstr "Please select an incomplete way."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Download {0} incomplete ways?"
-msgstr "Download incomplete objects"
+msgstr "Download {0} incomplete ways?"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
@@ -669,5 +645,5 @@
 "tracks."
 msgstr ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"Note: The GPL is not compatible with the OSM licence. Do not upload GPL licensed "
 "tracks."
 
@@ -760,4 +736,7 @@
 "This message will not shown again until JOSM is restarted."
 msgstr ""
+"The plugin {0} throwed an exception: {1}\n"
+"It may be outdated. Please contact the plugin's author.\n"
+"This message will not shown again until JOSM is restarted."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
@@ -779,5 +758,5 @@
 "\n"
 "This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider be kind and file a bug report."
+"version of JOSM, please consider being kind and file a bug report."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
@@ -818,7 +797,7 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
+#, java-format
 msgid "An error occoured in plugin {0}"
-msgstr "An error occoured while saving."
+msgstr "An error occoured in plugin {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
@@ -923,5 +902,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Click Reload to refresh list"
-msgstr ""
+msgstr "Click Reload to refresh list"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
@@ -930,15 +909,14 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-#, fuzzy
 msgid "Revert"
-msgstr "Remove"
+msgstr "Revert"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
 msgid "History"
-msgstr ""
+msgstr "History"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
 msgid "Display the history of all selected items."
-msgstr ""
+msgstr "Display the history of all selected items."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
@@ -949,9 +927,9 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
+msgstr "Reload all currently selected objects and refresh the list."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
@@ -965,4 +943,6 @@
 "in the history list."
 msgstr ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -975,15 +955,14 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-#, fuzzy
 msgid "Please select the objects you want to change properties for."
-msgstr "Please select the row to delete."
+msgstr "Please select the objects you want to change properties for."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, fuzzy, java-format
+#, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change {0} objects."
 msgstr[0] "This will change {0} object."
-msgstr[1] "This will change {0} object."
+msgstr[1] "This will change {0} objects."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
@@ -1007,5 +986,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "Please select objects for which you want to change properties."
-msgstr ""
+msgstr "Please select objects for which you want to change properties."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
@@ -1026,19 +1005,19 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, fuzzy, java-format
+#, java-format
 msgid "Could not read annotation preset source: {0}"
-msgstr "Could not read from url: \"{0}\""
+msgstr "Could not read annotation preset source: {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, fuzzy, java-format
+#, java-format
 msgid "Error parsing {0}: "
-msgstr "Error while parsing {0}"
+msgstr "Error parsing {0}: "
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, fuzzy, java-format
+#, java-format
 msgid "Change {0} object"
 msgid_plural "Change {0} objects"
-msgstr[0] "This will change {0} object."
-msgstr[1] "This will change {0} object."
+msgstr[0] "Change {0} object."
+msgstr[1] "Change {0} objects."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
@@ -1113,12 +1092,12 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown type at line {0}"
-msgstr "Unknown file extension: {0}"
+msgstr "Unknown type at line {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
 #, java-format
 msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
+msgstr "Cannot have a writable combobox with default values (line {0})"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
@@ -1127,22 +1106,21 @@
 "display_values ({0}) and values ({1}) must be of same number of elements."
 msgstr ""
+"display_values ({0}) and values ({1}) must be of same number of elements."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-#, fuzzy
 msgid "element"
 msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segment"
+msgstr[0] "element"
+msgstr[1] "elements"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
 #, java-format
 msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr ""
+msgstr "Unknown annotation object {0} at line {1} column {2}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-#, fuzzy
 msgid "Change Properties"
-msgstr "Properties"
+msgstr "Change Properties"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
@@ -1150,27 +1128,24 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
 #: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-#, fuzzy
 msgid "node"
 msgid_plural "nodes"
 msgstr[0] "node"
-msgstr[1] "node"
+msgstr[1] "nodes"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:136
-#, fuzzy
 msgid "segment"
 msgid_plural "segments"
 msgstr[0] "segment"
-msgstr[1] "segment"
+msgstr[1] "segments"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:137
-#, fuzzy
 msgid "way"
 msgid_plural "ways"
 msgstr[0] "way"
-msgstr[1] "way"
+msgstr[1] "ways"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
@@ -1193,61 +1168,55 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#, fuzzy
 msgid "track"
 msgid_plural "tracks"
 msgstr[0] "track"
-msgstr[1] "track"
+msgstr[1] "tracks"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
-#, fuzzy
 msgid "point"
 msgid_plural "points"
 msgstr[0] "point"
-msgstr[1] "point"
+msgstr[1] "points"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
-#, fuzzy, java-format
+#, java-format
 msgid "a track with {0} point"
 msgid_plural "a track with {0} points"
 msgstr[0] "a track with {0} point"
-msgstr[1] "a track with {0} point"
+msgstr[1] "a track with {0} points"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
-#, fuzzy, java-format
+#, java-format
 msgid "{0} consists of {1} track"
 msgid_plural "{0} consists of {1} tracks"
 msgstr[0] "{0} consists of {1} track"
-msgstr[1] "{0} consists of {1} track"
+msgstr[1] "{0} consists of {1} tracks"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
-#, fuzzy, java-format
+#, java-format
 msgid "{0} point"
 msgid_plural "{0} points"
 msgstr[0] "{0} point"
-msgstr[1] "{0} point"
+msgstr[1] "{0} points"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
-#, fuzzy
 msgid "Customize line drawing"
-msgstr "Customise Colour"
+msgstr "Customise line drawing"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-#, fuzzy
 msgid "Use global settings."
-msgstr "Display Settings"
+msgstr "Use global settings."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
-#, fuzzy
 msgid "Draw lines between points for this layer."
-msgstr "Draw lines between raw gps points."
+msgstr "Draw lines between points for this layer."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-#, fuzzy
 msgid "Do not draw lines between points for this layer."
-msgstr "Draw lines between raw gps points."
+msgstr "Do not draw lines between points for this layer."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
 msgid "Select line drawing options"
-msgstr ""
+msgstr "Select line drawing options"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
@@ -1284,5 +1253,5 @@
 #, java-format
 msgid "Images for {0}"
-msgstr ""
+msgstr "Images for {0}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
@@ -1333,9 +1302,8 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, fuzzy
 msgid "image"
 msgid_plural "images"
 msgstr[0] "image"
-msgstr[1] "image"
+msgstr[1] "images"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
@@ -1409,60 +1377,58 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#, fuzzy
 msgid "Java OpenStreetMap Editor"
-msgstr "Java Open Street Map - Editor"
+msgstr "Java OpenStreetMap Editor"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "usage"
-msgstr ""
+msgstr "usage"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-#, fuzzy
 msgid "options"
-msgstr "Export options"
+msgstr "options"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Show this help"
-msgstr ""
+msgstr "Show this help"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Standard unix geometry argument"
-msgstr ""
+msgstr "Standard unix geometry argument"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Download the bounding box"
-msgstr ""
+msgstr "Download the bounding box"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
 msgid "Open file (as raw gps, if .gpx or .csv)"
-msgstr ""
+msgstr "Open file (as raw gps, if .gpx or .csv)"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Download the bounding box as raw gps"
-msgstr ""
+msgstr "Download the bounding box as raw gps"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid "Select with the given search"
-msgstr ""
+msgstr "Select with the given search"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Don't launch in fullscreen mode"
-msgstr ""
+msgstr "Don't launch in fullscreen mode"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Reset the preferences to default"
-msgstr ""
+msgstr "Reset the preferences to default"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Set the language. Example: "
-msgstr ""
+msgstr "Set the language. Example: "
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "examples"
-msgstr ""
+msgstr "examples"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
@@ -1471,8 +1437,10 @@
 "some data before --selection"
 msgstr ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
+msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
@@ -1497,9 +1465,9 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
-#, fuzzy, java-format
+#, java-format
 msgid "{0} object has conflicts:"
 msgid_plural "{0} objects have conflicts:"
 msgstr[0] "{0} object has conflicts:"
-msgstr[1] "{0} object has conflicts:"
+msgstr[1] "{0} objects have conflicts:"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
@@ -1603,5 +1571,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
 msgid "Draw large GPS points."
-msgstr ""
+msgstr "Draw large GPS points."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
@@ -1617,5 +1585,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
 msgid "Draw larger dots for the GPS points."
-msgstr ""
+msgstr "Draw larger dots for the GPS points."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
@@ -1647,5 +1615,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid "Annotation preset source"
-msgstr ""
+msgstr "Annotation preset source"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
@@ -1700,13 +1668,14 @@
 "http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
 msgstr ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Add a new annotation preset source to the list."
-msgstr ""
+msgstr "Add a new annotation preset source to the list."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
-#, fuzzy
 msgid "Delete the selected source from the list."
-msgstr "Delete the selected layer."
+msgstr "Delete the selected source from the list."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
@@ -1778,17 +1747,17 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Annotation preset sources"
-msgstr ""
+msgstr "Annotation preset sources"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Configure available Plugins."
-msgstr ""
+msgstr "Configure available Plugins."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
 msgid "Get more plugins"
-msgstr ""
+msgstr "Get more plugins"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
@@ -1825,5 +1794,5 @@
 #, java-format
 msgid "Couldn''t read time format \"{0}\"."
-msgstr "Couldn''t read time format \"{0}\"."
+msgstr "Couldn't read time format \"{0}\"."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
@@ -1838,5 +1807,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
 msgid "Illformed Node id"
-msgstr "Illformed Node id"
+msgstr "Ill-formed Node id"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
@@ -1914,10 +1883,10 @@
 #, java-format
 msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr ""
+msgstr "Data error: Segment {0} is deleted but part of Way {1}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
 #, java-format
 msgid "Data error: Node {0} is deleted but part of Segment {1}"
-msgstr ""
+msgstr "Data error: Node {0} is deleted but part of Segment {1}"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
@@ -1970,9 +1939,9 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "{0} node"
 msgid_plural "{0} nodes"
 msgstr[0] "{0} node"
-msgstr[1] "{0} node"
+msgstr[1] "{0} nodes"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
@@ -1998,5 +1967,5 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
-msgstr ""
+msgstr "scale"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
@@ -2024,19 +1993,18 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-#, fuzzy
 msgid "object"
 msgid_plural "objects"
 msgstr[0] "object"
-msgstr[1] "object"
+msgstr[1] "objects"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
 #, java-format
 msgid "Plugin not found: {0}."
-msgstr ""
+msgstr "Plugin not found: {0}."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, fuzzy, java-format
+#, java-format
 msgid "Could not load plugin {0}."
-msgstr "Could not read \"{0}\""
+msgstr "Could not load plugin {0}."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
@@ -2061,15 +2029,13 @@
 #: ../osmarender/src/OsmarenderPlugin.java:108
 msgid "View"
-msgstr ""
+msgstr "View"
 
 #: ../landsat/src/landsat/DownloadLandsatTask.java:18
-#, fuzzy
 msgid "Landsat background images"
-msgstr "Download and show landsat background images."
+msgstr "Landsat background images"
 
 #: ../landsat/src/landsat/LandsatLayer.java:45
-#, fuzzy
 msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr "Wrong longitude transformation for tile cache. Can't operate on {0}"
+msgstr "Wrong longitude transformation for tile manager. Can't operate on {0}"
 
 #: ../landsat/src/landsat/LandsatLayer.java:70
@@ -2080,5 +2046,5 @@
 #: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
 msgid "Annotation Preset Tester"
-msgstr ""
+msgstr "Annotation Preset Tester"
 
 #: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
@@ -2087,8 +2053,10 @@
 "dialogs."
 msgstr ""
+"Open the annotation preset test tool for previewing annotation preset "
+"dialogs."
 
 #: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
 msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
+msgstr "You have to specify annotation sources in the preferences first."
 
 #~ msgid "Download {0} ways containing a total of {1} segments?"
