Index: /applications/editors/josm/plugins/lang/de/de.po
===================================================================
--- /applications/editors/josm/plugins/lang/de/de.po	(revision 3651)
+++ /applications/editors/josm/plugins/lang/de/de.po	(revision 3652)
@@ -7,5 +7,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-22 21:32+0200\n"
+"POT-Creation-Date: 2007-07-21 14:05+0200\n"
 "PO-Revision-Date: 2006-10-14 20:38+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -17,112 +17,470 @@
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
-msgid "Add segment"
-msgstr "Abschnitt hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
-msgid "Add a segment between two nodes."
-msgstr "Abschnitt zwischen zwei Knotenpunkten hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr "Kann den Knotenpunkt nicht löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr "Das Objekt wird benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr "Wird bei mehr als zwei Abschnitten benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr "Wird bei einen Abschnitt benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr "Falsche Richtung der Abschnitte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr "Schlüsselkonflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr "Abschnitte gehören zu verschiedenen Wegen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr "Knotenpunkt löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-msgstr "Zoomen durch anklicken  (Strg-Hoch,Links,Runter,Rechts,+,-)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "von"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "bis"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "nichts"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "Abschnitte"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "Position"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "verschieden"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "gelöscht"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "wahr"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "falsch"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:183
+msgid "background"
+msgstr "Hintergrund"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:184
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:70
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "Knotenpunkt"
+msgstr[1] "Knotenpunkte"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "Abschnitt"
+msgstr[1] "Abschnitte"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "Weg"
+msgstr[1] "Wege"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+msgid "incomplete way"
+msgstr "unvollständiger Weg"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+msgid "selected"
+msgstr "gewählt"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+msgid "gps point"
+msgstr "GPS Punkt"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "conflict"
+msgstr "Konflikt"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+msgid "scale"
+msgstr "Skala"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#, fuzzy, java-format
+msgid "Preferences stored on {0}"
+msgstr "Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
+#, fuzzy, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kann das Plugin {0}nicht laden."
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+msgid "new"
+msgstr "neu"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:106
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:91
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} Knotenpunkt"
+msgstr[1] "{0} Knotenpunkte"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:94
+msgid "incomplete"
+msgstr "unvollständig"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:227
+#, java-format
+msgid "Plugin not found: {0}."
+msgstr "Plugin nicht gefunden: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:255
+#, java-format
+msgid "Could not load plugin {0}."
+msgstr "Kann das Plugin {0}nicht laden."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:316
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr ""
+"Die Projektion kann nicht aus den Einstellungen ermittelt werden. Benutze "
+"RPSG:4263."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:386
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:388
+#, fuzzy
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:389
+msgid "Unsaved Changes"
+msgstr "Daten nicht gespeichert"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:401
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignoriere die ungültige URL: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload to OSM"
+msgstr "Zum OSM speichern"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload all changes to the OSM server."
+msgstr "Kartendaten zum OSM Server speichern"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Objects to add:"
+msgstr "Neue Objekte:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+msgid "Objects to modify:"
+msgstr "Geänderte Objekte:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+msgid "Objects to delete:"
+msgstr "Zu löschende Objekte:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
+#, fuzzy
+msgid "Upload these changes?"
+msgstr "Diese Änderungen vornehmen?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Nothing to upload. Get some data first."
+msgstr "Nichts geändert. Kann nichts hoch-laden."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr "Es gibt ungelöste Konflikte, die zuerst bearbeitet werden müssen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
+msgid "No changes to upload."
+msgstr "Kann keine Änderungen speichern."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
+msgid "Uploading data"
+msgstr "Sende Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
+msgid "Rename layer"
+msgstr "Ebene umbenennen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Auch die Datei umbenennen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Kann die Datei \"{0}\" nicht umbenennen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect All"
+msgstr "gewählt"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect all objects."
+msgstr "Den Schlüssel aus allen Objekten löschen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
+#, fuzzy
+msgid "Align Nodes in Line"
+msgstr "Knotenpunkte im Kreis anordnen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#, fuzzy
+msgid "Move the selected nodes onto a line."
+msgstr "Gewählte Punkte auf eine Kreisform bringen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
+#, fuzzy
+msgid "Please select at least three nodes."
+msgstr "Bitte wählen Sie mindestens vier Punkte aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Dateien (.osm .xml)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#, fuzzy
+msgid "GPX Files (.gpx .gpx.gz)"
+msgstr "GPX Dateien (.gpx)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Dateien (.csv .txt)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr "Knotenpunkte im Kreis anordnen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr "Gewählte Punkte auf eine Kreisform bringen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
+msgstr "Bitte wählen Sie mindestens vier Punkte aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save the current data."
+msgstr "Speichere die aktuellen Daten."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
+msgid "data"
+msgstr "Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
+msgid "selection"
+msgstr "Auswahl"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
+msgid "layer"
+msgstr "Ebene"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom to {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "New"
+msgstr "neu"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "Create a new map."
+msgstr "Neuen Weg erstellen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr "unbenannt"
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine several ways into one."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#, fuzzy
+msgid "Please select at least two ways to combine."
+msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:91
+msgid "Enter values for all conflicts."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:100
+#, java-format
+msgid "Combine {0} ways"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "Kann nur Hilfeseite von JOSM Online Hilfe bearbeiten."
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+msgid "Open a preferences page for global settings."
+msgstr "öffnete eine Globale Einstellungs-Seite."
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Wiederherstellen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Wiederhole die letzte zurückgenommene Aktion."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save as"
+msgstr "Speichern als"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save the current data to a new file."
+msgstr "Speichere die aktuellen Daten als neue Datei."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+#, fuzzy
+msgid "Reorder Segments"
+msgstr "Richtung ändern"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+msgid ""
+"Try to reorder segments of a way so that they are in a line. May try to flip "
+"segments around to match a line."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:41
+#, fuzzy
+msgid "Please select at least one way."
+msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
+#, fuzzy
+msgid "Reorder segments"
+msgstr "Alle Abschnitte neu anordnen?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
+#, fuzzy
+msgid "The selected way is incomplete or has only one segment."
+msgid_plural ""
+"None of the selected ways are complete and have more than one segment."
+msgstr[0] "Bitte wählen Sie mindestens einen Abschnitt aus."
+msgstr[1] "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
+#, fuzzy, java-format
+msgid "Reorder segments for way {0}"
+msgstr "Abschnitte eines Weges hinzufügen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add node"
+msgstr "Knotenpunkt hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add a new node to the map"
+msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:142
+msgid "Add node into segment"
+msgstr "Knotenpunkt in einen Abschnitt einfügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+msgid "Add a node into an existing segment"
+msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:167
+#, fuzzy
+msgid "Add node and connect"
+msgstr "Knotenpunkt in einen Abschnitt einfügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+msgid "Add a node and connect it to the selected (previously added) node"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
+msgid "Can not add a node outside of the world."
+msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects by dragging or clicking."
 msgstr "Wähle Objekte durch ziehen oder klicken."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Verbundene Linie"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Select objects in a straight line."
 msgstr "Wähle Objekte in einer Reihe."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Verschieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr ""
-"Objekte die sich unter der Maus befinden oder ausgewählt sind verschieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add Way"
 msgstr "Weg hinzufügen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add a new way to the data."
 msgstr "Füge einen neuen Weg hinzu."
 
-#: ../../../../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."
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#, fuzzy
+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 "
 "werden, bevor Abschnitte hinzugefügt werden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -141,26 +499,26 @@
 "Sollen alle Abschnitte zu dem Wegen hinzugefügt werden?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Abschnitte eines Weges hinzufügen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/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?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Abschnitte zum Weg hinzufügen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Alle Abschnitte neu anordnen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Neu Anordnen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -169,685 +527,306 @@
 msgstr[1] "Soll ein neuer Weg aus {0} Abschnitten erstellt weden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 msgid "Create new way"
 msgstr "Neuen Weg erstellen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add node"
-msgstr "Knotenpunkt hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add a new node to the map"
-msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add node into segment"
-msgstr "Knotenpunkt in einen Abschnitt einfügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add a node into an existing segment"
-msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
-msgid "Can not add a node outside of the world."
-msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
-msgid "Add Node into Segment"
-msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr "Roh GPS-Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Hole GPS-Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:21
-msgid "Downloading data"
-msgstr "Lade Daten aus dem Internet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Keine Daten importiert."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Daten-Ebene"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr "Kann den Knotenpunkt nicht löschen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr "Das Objekt wird benutzt."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr "Wird bei mehr als zwei Abschnitten benutzt."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr "Wird bei einen Abschnitt benutzt."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Falsche Richtung der Abschnitte."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Schlüsselkonflikt"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr "Abschnitte gehören zu verschiedenen Wegen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
+msgstr "Knotenpunkt löschen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Verschieben"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr ""
+"Objekte die sich unter der Maus befinden oder ausgewählt sind verschieben"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
+msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#, fuzzy
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
+msgstr "Zoomen durch anklicken  (Strg-Hoch,Links,Runter,Rechts,+,-)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+msgid "Add segment"
+msgstr "Abschnitt hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+msgid "Add a segment between two nodes."
+msgstr "Abschnitt zwischen zwei Knotenpunkten hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download from OSM"
+msgstr "Von OSM laden"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download map data from the OSM server."
+msgstr "Kartendaten vom OSM Server laden"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
+#, fuzzy
+msgid "Download"
+msgstr "Daten laden?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
+#, fuzzy
+msgid "Please select at least one task to download"
+msgstr "Bitte wählen Sie mindestens einen Quelle zum laden aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse segments"
+msgstr "Richtung ändern"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse the direction of all selected Segments."
+msgstr "Richtung der ausgewählten Abschnitte umdrehen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:44
+msgid "Please select at least one segment."
+msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:55
 msgid "Reverse Segments"
 msgstr "Richtung ändern"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-msgid "Revert the direction of all selected Segments."
-msgstr "Richtung der ausgewählten Abschnitte umdrehen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
-msgid "Please select at least one segment."
-msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-msgid "Open a preferences page for global settings."
-msgstr "öffnete eine Globale Einstellungs-Seite."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open"
-msgstr "Öffnen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open a file."
-msgstr "Datei öffnen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Dateiendung unbekannt: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:59
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Fehler beim Parsen. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:63
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Kann \"{0}\" nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr "Erledige {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr "Für das Werkzeug ist es nötig das Daten geladen sind."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr "Kann \"{0}\" nicht ausführen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr "Werkzeuge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-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 "Knotenpunkte im Kreis anordnen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr "Gewählte Punkte auf eine Kreisform bringen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-msgstr "Bitte wählen Sie mindestens vier Punkte aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr "Ebene umbenennen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Auch die Datei umbenennen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Kann die Datei \"{0}\" nicht umbenennen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "File exists. Overwrite?"
+msgstr "Datei existiert. Überschreiben?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit"
+msgstr "Beenden"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit the application."
+msgstr "Beende das Programm."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+#, fuzzy
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
+"GPL  stehen hoch-spielen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "In GPX exportieren"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Die Daten ins GPX-Format exportieren."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "GPS Track-Beschreibung"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Information zum Autor hinzufügen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Voller Name"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Vordefiniert"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Jahr des Copyrights"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Export-Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:78
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:62
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Fehler beim exportieren von. {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:79
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+msgid "Error"
+msgstr "Fehler"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Wähle eine vordefinierte Lizenz"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download from OSM"
-msgstr "Von OSM laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download map data from the OSM server."
-msgstr "Kartendaten vom OSM Server laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
-msgid ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-msgstr ""
-"Sie können verschieben und Zoomen wie auf der Hauptkarte. Wählen Sie den zu "
-"ladenden Bereich durch einfügen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
-msgid "Bounding box"
-msgstr "Zeichen-Box"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
-msgid "min lat"
-msgstr "min Breite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
-msgid "min lon"
-msgstr "min Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
-msgid "max lat"
-msgstr "max Breite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
-msgid "max lon"
-msgstr "max Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-msgid "Download the following data:"
-msgstr "Lade die folgenden Daten aus dem Internet:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
-msgid "URL from www.openstreetmap.org"
-msgstr "URL von www.openstreetmap.org"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
-msgid "Bookmarks"
-msgstr "Lesezeichen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
-msgid "Please enter the desired coordinates first."
-msgstr "Bitte wählen Sie zuerst die Koordinaten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
-msgid "Please enter a name for the location."
-msgstr "Bitte geben Sie einen Namen für den Ort an."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
-msgid "Select a bookmark first."
-msgstr "Bitte wählen Sie ein Lesezeichen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
-msgid "Choose an area"
-msgstr "Bereich auswählen"
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-msgid "Please select at least one download data type."
-msgstr "Bitte wählen Sie mindestens einen Quelle zum laden aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit"
-msgstr "Beenden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit the application."
-msgstr "Beende das Programm."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "About"
-msgstr "Über"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "Display the about screen."
-msgstr "Über dieses Programm"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
-#, java-format
-msgid "Java OpenStreetMap Editor Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#, java-format
-msgid "last change at {0}"
-msgstr "Letzte Änderung am {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, java-format
-msgid "Java Version {0}"
-msgstr "Java  Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
-msgid "Homepage"
-msgstr "Webseite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
-msgid "Bug Reports"
-msgstr "Fehler melden:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "News about JOSM"
-msgstr "Neues über JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
-msgid "Info"
-msgstr "Info"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "Readme"
-msgstr "Bitte lesen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
-msgid "Revision"
-msgstr "Version"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-msgid "Contribution"
-msgstr "Mitwirkung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
-msgid "About JOSM..."
-msgstr "Über JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
-msgid "File could not be found."
-msgstr "Datei wurde nicht gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr "Leeres Dokument"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. "
-"Sollen alle Konflikte abgewiesen werden?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr "Konflikte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "File exists. Overwrite?"
-msgstr "Datei existiert. Überschreiben?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "Overwrite"
-msgstr "Überschreiben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-msgid "data"
-msgstr "Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-msgid "selection"
-msgstr "Auswahl"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
-msgid "layer"
-msgstr "Ebene"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
-msgid "conflict"
-msgstr "Konflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
-#, java-format
-msgid "Auto Scale: {0}"
-msgstr "Automatisch skalieren: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
-#, java-format
-msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
-msgstr ""
-"Den Bereich automatisch zoomen (nach {0}. Ausgeschaltet wenn der Bereich "
-"bewegt wird)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Speichern als"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Speichere die aktuellen Daten als neue Datei."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "OSM Server Dateien (.osm .xml)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "GPX Dateien (.gpx)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "CSV Dateien (.csv .txt)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload to OSM"
-msgstr "Zum OSM speichern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload all changes to the OSM server."
-msgstr "Kartendaten zum OSM Server speichern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
-msgid "Nothing to upload. Get some data first."
-msgstr "Nichts geändert. Kann nichts hoch-laden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr "Es gibt ungelöste Konflikte, die zuerst bearbeitet werden müssen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Uploading data"
-msgstr "Sende Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
-msgid "No changes to upload."
-msgstr "Kann keine Änderungen speichern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Objects to add:"
-msgstr "Neue Objekte:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
-msgid "Objects to modify:"
-msgstr "Geänderte Objekte:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
-msgid "Objects to delete:"
-msgstr "Zu löschende Objekte:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
-msgid "Upload this changes?"
-msgstr "Diese Änderungen vornehmen?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:54
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:106
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Kann nur Hilfeseite von JOSM Online Hilfe bearbeiten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, java-format
-msgid "Downloading {0} segment"
-msgid_plural "Downloading {0} segments"
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+#, fuzzy
+msgid "Select All"
+msgstr "Wähle aus"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
+#, fuzzy, java-format
+msgid "Downloading {0} way"
+msgid_plural "Downloading {0} ways"
 msgstr[0] "Hole {0} Abschnitt"
 msgstr[1] "Hole {0} Abschnitte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download incomplete objects"
 msgstr "Unvollständige Objekte nachladen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr "Alle (ausgewählten) unvollständigen Wege vom OSM Server laden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
 msgid "Please select an incomplete way."
 msgstr "Bitte einen unvollständigen Weg auswählen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 #, java-format
 msgid "Download {0} incomplete ways?"
 msgstr "{0} unvollständige Wege nachladen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 msgid "Download?"
 msgstr "Daten laden?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Wiederherstellen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Wiederhole die letzte zurückgenommene Aktion."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
-"GPL  stehen hoch-spielen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "In GPX exportieren"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Die Daten ins GPX-Format exportieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "GPS Track-Beschreibung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Information zum Autor hinzufügen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Voller Name"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "E-Mail"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Vordefiniert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Jahr des Copyrights"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Schlüsselwörter"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Export-Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Fehler beim exportieren von. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Fehler"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Wähle eine vordefinierte Lizenz"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr "Speichern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr "Speichere die aktuellen Daten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr "CSV Ausgabe ist noch nicht möglich."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr "Dateiendung unbekannt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr "Beim Speichern ist ein Fehler aufgetreten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
-#, java-format
-msgid ""
-"The plugin {0} throwed an exception: {1}\n"
-"It may be outdated. Please contact the plugin's autor.\n"
-"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
-msgid "Do nothing"
-msgstr "Nichts tun"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Fehler melden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occoured.\n"
-"\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."
-msgstr ""
-"Ein unvorhergesehener Fehler trat auf.\n"
-"\n"
-"Dies ist immer ein Programmierfehler. Wenn Sie die neueste\n"
-"Version von JOSM einsetzen, seine Sie bitte so gut und melden \n"
-"uns den Fehler als \"Bug Report\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Unerwarteter Fehler"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-"Bitte senden Sie diesen an josm@eigenheimstrasse.de\n"
-"\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-"Bitte schicken Sie eine E-Mail mit den folgenden Text an "
-"josm@eigenheimstrasse.de"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
-msgid "Ctrl-"
-msgstr "Strg-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
-msgid "Alt-"
-msgstr "Alt-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
-msgid "AltGr-"
-msgstr "AltGr-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "Shift-"
-msgstr "Shift-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "Ein Fehler ist im Plugin {0} aufgetreten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
 msgid "Load Selection"
 msgstr "Lade Auswahl"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
 #, java-format
 msgid "Contact {0}..."
 msgstr "Verbinde zu {0} ..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
 msgid "Downloading..."
 msgstr "Lade Daten ..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Kann die URL \"{0}\" nicht lesen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Kann die URL \"{0}\" nicht parsen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Current Selection"
-msgstr "Aktuelle Auswahl"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Open a selection list window."
-msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "Search"
+msgstr "Suche"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#, fuzzy
+msgid "Search for objects."
+msgstr "Einstellungen der Ausgewählten Objekte."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
+#, fuzzy
+msgid "No data loaded."
+msgstr "Keine Daten importiert."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
 msgid "Please enter a search string."
 msgstr "Bitte geben Sie einen Suchbegriff ein."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -865,331 +844,622 @@
 "html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
-msgid "Search"
-msgstr "Suche"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Konflikte lösen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Lösen"
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr "Wähle aus"
-
-#: ../../../../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."
-msgstr ""
-"Setze die gewählten Elemente auf der Karte auf die obige Liste der "
-"ausgewählten Objekte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
-msgid "Please select something from the conflict list."
-msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-msgid "Resolve Conflicts"
-msgstr "Konflikte entfernen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Neu Laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Zücknehmen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Geschichte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:59
+msgid "No document open so nothing to save."
+msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "The document contains no data. Save anyway?"
+msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "Empty document"
+msgstr "Leeres Dokument"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. "
+"Sollen alle Konflikte abgewiesen werden?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid "Conflicts"
+msgstr "Konflikte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "CSV output not supported yet."
+msgstr "CSV Ausgabe ist noch nicht möglich."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+msgid "Unknown file extension."
+msgstr "Dateiendung unbekannt."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:108
+#, fuzzy
+msgid "An error occurred while saving."
+msgstr "Beim Speichern ist ein Fehler aufgetreten."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+msgid "Split Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+#, fuzzy
+msgid "Split a way at the selected node."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgid "The current selection cannot be used for splitting."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:160
+#, fuzzy
+msgid "The selected node is not part of any way."
+msgid_plural "The selected nodes are not part of any way."
+msgstr[0] "Gewählte Punkte auf eine Kreisform bringen."
+msgstr[1] "Gewählte Punkte auf eine Kreisform bringen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+msgid ""
+"There is more than one way using the node(s) you selected. Please select the "
+"way also."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:176
+#, fuzzy
+msgid "The selected nodes do not share the same way."
+msgstr "Gewählte Punkte auf eine Kreisform bringen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:190
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:210
+msgid "The selected segment is not part of any way."
+msgid_plural "The selected segments are not part of any way."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+msgid ""
+"There is more than one way using the segment you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the segments you selected. Please select "
+"the way also."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:228
+msgid "The selected segments do not share the same way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#, fuzzy
+msgid "The selected way does not contain the selected segment."
+msgid_plural "The selected way does not contain all the selected segments."
+msgstr[0] "Bitte wählen Sie mindestens einen Abschnitt aus."
+msgstr[1] "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:245
+#, fuzzy
+msgid "Warning: This way is incomplete. Try to download it before splitting."
+msgstr ""
+"Achtung: Dieser Weg ist nicht vollständig. Er sollte vom Server geladen "
+"werden, bevor Abschnitte hinzugefügt werden."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:360
+msgid "The selected segments are not in the same contiguous part of the way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:373
+msgid ""
+"Removing the selected segments would make a part of the way non-contiguous."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:410
+msgid ""
+"The way cannot be split at the selected node. (Hint: To split circular ways, "
+"select two nodes.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:412
+msgid ""
+"The way cannot be split because it is contiguous. (Hint: To split at a node, "
+"select that node.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "About"
+msgstr "Über"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Display the about screen."
+msgstr "Über dieses Programm"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#, java-format
+msgid "last change at {0}"
+msgstr "Letzte Änderung am {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java  Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
+msgid "Homepage"
+msgstr "Webseite"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Bug Reports"
+msgstr "Fehler melden:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "News about JOSM"
+msgstr "Neues über JOSM..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
+msgid "Readme"
+msgstr "Bitte lesen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
+msgid "Revision"
+msgstr "Version"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
+msgid "Contribution"
+msgstr "Mitwirkung"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+msgid "About JOSM..."
+msgstr "Über JOSM..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "File could not be found."
+msgstr "Datei wurde nicht gefunden."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open"
+msgstr "Öffnen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open a file."
+msgstr "Datei öffnen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:67
+#: ../waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:70
+#: ../waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kann \"{0}\" nicht lesen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:81
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Dateiendung unbekannt: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:104
+#, fuzzy, java-format
+msgid "Tracks from {0}"
+msgstr "Bilder für {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
+#, fuzzy, java-format
+msgid "Markers from {0}"
+msgstr "Bilder für {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:29
+msgid "Downloading data"
+msgstr "Lade Daten aus dem Internet"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:41
+msgid "No data imported."
+msgstr "Keine Daten importiert."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
+msgid "Data Layer"
+msgstr "Daten-Ebene"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:50
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:27
+msgid "Downloading GPS data"
+msgstr "Hole GPS-Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Raw GPS data"
+msgstr "Roh GPS-Daten"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:23
+#, fuzzy
+msgid "Do not show again"
+msgstr "Nichts tun"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
+#, fuzzy
+msgid "Information"
+msgstr "Information zum Autor hinzufügen."
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:61
+#, java-format
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+msgid "Should the plugin be disabled?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+msgid "Disable plugin"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+msgid ""
+"The plugin could not be removed. Please tell the people you got JOSM from "
+"about the problem."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Do nothing"
+msgstr "Nichts tun"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Report Bug"
+msgstr "Fehler melden"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+msgstr ""
+"Ein unvorhergesehener Fehler trat auf.\n"
+"\n"
+"Dies ist immer ein Programmierfehler. Wenn Sie die neueste\n"
+"Version von JOSM einsetzen, seine Sie bitte so gut und melden \n"
+"uns den Fehler als \"Bug Report\"."
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+msgid "Unexpected Exception"
+msgstr "Unerwarteter Fehler"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Bitte schicken Sie eine E-Mail mit den folgenden Text an "
+"josm@eigenheimstrasse.de"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:124
+msgid "The text has already been copied to your clipboard."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Ctrl-"
+msgstr "Strg-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "Alt-"
+msgstr "Alt-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
+msgid "Shift-"
+msgstr "Shift-"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
+#, fuzzy
+msgid "Downloading incomplete ways..."
+msgstr "{0} unvollständige Wege nachladen?"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
+msgid "Fix data errors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
+#, fuzzy, java-format
+msgid "Segment {0} is deleted but part of Way {1}"
+msgstr "Daten-Fehler: Abschnit {0} ist gelöscht aber teil des Wegs {1}."
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
+#, fuzzy
+msgid "Data error"
+msgstr "Daten-Ebene"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr "Daten-Fehler: Abschnit {0} ist gelöscht aber teil des Wegs {1}."
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+"Daten-Fehler: Knotenpunkt {0} ist gelöscht, aber Teil des Abschnittes {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
+#, fuzzy, java-format
+msgid "Data error: lat value \"{0}\" is out of bounds."
+msgstr "Daten Fehler: lat Wert \"{0}\" hat eine Grenze überschritten."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
+#, fuzzy, java-format
+msgid "Data error: lon value \"{0}\" is out of bounds."
+msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Überspiele {0} {1} ({2})..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+msgid "Unknown host"
+msgstr "Rechner unbekannt."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Kann das Format nicht ermitteln."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#, fuzzy
+msgid ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in preferences."
+msgstr ""
+"Die Format Zeile in dem Daten ist unvollständig oder nicht vorhanden. "
+"Versuchen sie das Format in den Einstellungen einzustellen."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+"Die Format -Zeile ist unvollständig. Brauche mindestens 'lat' und 'lon' "
+"Spalten."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Unbekannter Datentyp \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, fuzzy
+msgid "Maybe add a format string in preferences."
+msgstr "Vielleicht sollte das Format in den Einstellungen festgelegt werden."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Fehler beim parsen der Zeile {0}"
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
+#, fuzzy
+msgid "Contacting OSM Server..."
+msgstr "Versuche OSM Server zu erreichen...."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Lade Punkte {0} bis {1}..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+msgid "Downloading OSM data..."
+msgstr "Hole OSM-Daten...."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:116
+msgid "Unknown version"
+msgstr "Version unbekannt."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:145
+msgid "Found <seg> tag on non-way."
+msgstr "<seg>-Tag auf einen Nicht-Weg gefunden."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
+msgid "Incomplete segment with id=0"
+msgstr "Unvollständiger Abschnitt mit id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
+#, fuzzy
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException. Vielleicht fehlende Tags."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+msgid "Illegal object with id=0"
+msgstr "Illegales Objekt mit id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#, fuzzy
+msgid "Couldn't read time format \"{0}\"."
+msgstr "Kann das Zeit-Format \"{0}\" nicht lesen."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:220
+#, fuzzy, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+msgid "Preparing data..."
+msgstr "Breite Daten vor ...."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+msgid "Illformed Node id"
+msgstr "Kranken Knotenpunkt Id"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Fehler beim parsen."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Passwort oder Benutzername falsch."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+msgid "Password"
+msgstr "Passwort"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
+msgid "Save user and password (unencrypted)"
+msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
+msgid "Enter Password"
+msgstr "Passwort eingeben"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
+msgid "Aborting..."
+msgstr "Abbruch..."
+
+#: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Abfolge"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Entferne \"{0}\" für"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Setze {0}={1} für"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "Objekt"
+msgstr[1] "Objekte"
+
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Löse {0} Konflikte in {1} Objekten"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Ändere"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Breite/Länge"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Object"
 msgstr "Objekt"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Datum"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Noch nicht fertig."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
-"zurückführen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Command Stack"
-msgstr "Befehlsliste"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Bitte wählen Sie die Objekte an denen die Eigenschaften geändert werden "
-"sollen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, java-format
-msgid "This will change {0} object."
-msgid_plural "This will change {0} objects."
-msgstr[0] "Dies wird ein {0} Objekt ändern"
-msgstr[1] "Dies wird {0} Objekte ändern."
-
-#: ../../../../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.)"
-msgstr ""
-"Bitte geben Sie einen neuen Wert für \"{0}\" an.<br>(Leereingabe löscht den "
-"Eintrag.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
-msgid "Change values?"
-msgstr "Wert ändern?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
-msgid "<different>"
-msgstr "<verschieden>"
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "Please select a key"
-msgstr "Bitte wählen Sie einen Schlüssel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-msgid "Please select a value"
-msgstr "Bitte wählen Sie einen Wert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Properties"
-msgstr "Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Property for selected objects."
-msgstr "Einstellungen der Ausgewählten Objekte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Fehler beim Parsen. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ändere {0} Objekt"
-msgstr[1] "Ändere {0} Objekte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Key"
-msgstr "Schlüssel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Value"
-msgstr "Wert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
-msgid "Please select the row to edit."
-msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
-msgid "Please select the row to delete."
-msgstr "Bitte wählen Sie die löschende Zeile."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-msgid "Add a new key/value pair to all objects"
-msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-#: ../../plugins/grid/src/grid/GridPlugin.java:43
-#: ../../plugins/grid/src/grid/GridPlugin.java:49
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-msgid "Edit the value of the selected key for all objects"
-msgstr "Den Wert des Schlüssels für alle Objekte ändern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-msgid "Delete the selected key in all objects"
-msgstr "Den Schlüssel aus allen Objekten löschen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
-msgid "Delete the selected layer."
-msgstr "Ausgewählte Ebene löschen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
-msgid "Show/Hide"
-msgstr "Zeigen/Verstecken"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Toggle visible state of the selected layer."
-msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Layers"
-msgstr "Ebenen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Open a list of all loaded layers."
-msgstr "Öffnet eine Liste alle geladenen Ebenen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
-msgid "Move the selected layer one row up."
-msgstr "Gewählte Ebene eine Reihe höher schieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
-msgid "Move the selected layer one row down."
-msgstr "Gewählte Ebene eine Reihe tiefer schieben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unbekannter Typ in Zeile {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 "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
-
-#: ../../../../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."
-msgstr ""
-"display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
-"haben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "Element"
-msgstr[1] "Elemente"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "Knotenpunkt"
-msgstr[1] "Knotenpunkte"
-
-#: ../../../../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
-msgid "segment"
-msgid_plural "segments"
-msgstr[0] "Abschnitt"
-msgstr[1] "Abschnitte"
-
-#: ../../../../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
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "Weg"
-msgstr[1] "Wege"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
-msgid "There were conflicts during import."
-msgstr "Es gab Konflikte beim Importieren.w"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} besteht aus:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
-#, java-format
-msgid " ({0} deleted.)"
-msgstr "({0} gelöscht)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#, fuzzy
+msgid "http://www.openstreetmap.org/traces"
+msgstr "URL von www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, fuzzy, java-format
+msgid "Converted from: {0}"
+msgstr "Kann die URL \"{0}\" nicht lesen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:157
 msgid "track"
 msgid_plural "tracks"
@@ -1197,5 +1467,5 @@
 msgstr[1] "Tracks"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgid "point"
 msgid_plural "points"
@@ -1203,5 +1473,5 @@
 msgstr[1] "Punkte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
 #, java-format
 msgid "a track with {0} point"
@@ -1210,5 +1480,5 @@
 msgstr[1] "Ein Track mit {0} Punkten"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1217,5 +1487,5 @@
 msgstr[1] "{0} besteht aus {1} Tracks"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} point"
@@ -1224,106 +1494,130 @@
 msgstr[1] "{0} Punkte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Customize line drawing"
 msgstr "Linen aussehen anpassen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 msgid "Use global settings."
 msgstr "Globale Einstellungen benutzen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Draw lines between points for this layer."
 msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
 msgid "Select line drawing options"
 msgstr "Wähle die Zeichen-Einstellungen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:150
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "Okay"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:253
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG Bilder (*.jpg)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:194
+msgid "There were conflicts during import."
+msgstr "Es gab Konflikte beim Importieren.w"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} besteht aus:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#, java-format
+msgid " ({0} deleted.)"
+msgstr "({0} gelöscht)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder für {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Lese GPS..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Kein Zeit für Punkt {0} x {1}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lese {0} ...."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr "Bilder mit Ortsbezug"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS Start: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Ende: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Momentaner Unterschied {0}s"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1331,164 +1625,96 @@
 msgstr[1] "Bilder"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innerhalb des Tracks."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Uhrzeit Synchronisieren"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Die Datei {0} kann nicht verarbeitet werden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Bild"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr "Zeit mit GPS Gerät synchronisieren"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
-msgid "Could not read bookmarks."
-msgstr "Kann Lesezeichen nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
-msgid "Could not write bookmark."
-msgstr "Kann Lesezeichen nicht schreiben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Java Open Street Map - Editor"
-msgstr "Java OpenStreetMap - Editor "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
-msgid "layer not in list."
-msgstr "Ebene nicht in der Liste."
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
-msgid "There are unsaved changes. Really quit?"
-msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
-msgid "Unsaved Changes"
-msgstr "Daten nicht gespeichert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap - Editor "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "usage"
-msgstr "Benutzung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "options"
-msgstr "Optionen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-msgid "Show this help"
-msgstr "Zeige diese Hilfe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-msgid "Standard unix geometry argument"
-msgstr "Standard Unix Geometrie Argument"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-msgid "Download the bounding box"
-msgstr "Lade den Zeichen-Kasten"
-
-#: ../../../../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 "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
-msgid "Open file (as raw gps, if .gpx or .csv)"
-msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
-msgid "Download the bounding box as raw gps"
-msgstr "Lade den Zeichen-Kasten als Roh-GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-msgid "Select with the given search"
-msgstr "Auswählen mit der angegebenen Suche"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-msgid "Don't launch in fullscreen mode"
-msgstr "Nicht im Vollbildmodus starten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-msgid "Reset the preferences to default"
-msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
-msgid "Set the language. Example: "
-msgstr "Die Sprache Einstellen. Beispiel:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
-msgid "examples"
-msgstr "Beispiele"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Parameter werden in der Reihenfolge ausgewertet, wie sie angegeben werden. "
-"Stellen Sie also sicher, das Daten existieren, bevor der Parameter --"
-"selection verwendet wird."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr "Ebene"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr "Dateien"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr "Verbindung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:128
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:146
+#, fuzzy, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} besteht aus {1} Track"
+msgstr[1] "{0} besteht aus {1} Tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:86
+msgid "There was an error while trying to play the sound file for this marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:88
+#, fuzzy
+msgid "Error playing sound"
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:42
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "(URL was: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#, fuzzy
+msgid "Error displaying URL"
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
 msgid "Contacting the OSM server..."
 msgstr "Versuche OSM Server zu erreichen...."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Lat/Lon"
-msgstr "Breite/Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Key"
+msgstr "Schlüssel"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Value"
+msgstr "Wert"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1497,173 +1723,155 @@
 msgstr[1] "{0} Objekte haben Konflikte:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
 msgid "my version:"
 msgstr "meine Version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
 msgid "their version:"
 msgstr "deren Version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
 msgid "resolved version:"
 msgstr "neue Version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
-msgid "Error while parsing"
-msgstr "Fehler beim Parsen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
-msgid "File Not found"
-msgstr "Datei wurde nicht gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "string"
-msgstr "Zeichenkette"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-msgid "Name of the user."
-msgstr "Name des Benutzers."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-msgid "OSM Password."
-msgstr "OSM Passwort."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Ändere die Größe auf den angegeben Wert (Format: Breitex Höhe)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "string;string;..."
-msgstr "Zeichenkette;Zeichenkette;..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Lade Daten. Kann x1,y1,x2,y2; eine URL mit lat=y&lon=x&zomm=z oder ein "
-"Dateiname sein."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Alles als Roh GPS Daten speichern. Kann x1,y1,x2,y2, eine URL mit "
-"lat=y&llon=x&zoom=z oder ein Dateiname sein."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
-msgstr ""
-"Alle zu der Initialen Selektion hinzufügen. Kann eine Google ähnliche "
-"Suchanfrage oder eine URL  auf ein osm-xml Dokument sein."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "any"
-msgstr "jeder"
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
-msgid "Username"
-msgstr "Benutzername"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
-msgid "Password"
-msgstr "Passwort"
-
-#: ../../../../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."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
-msgid "Draw lines between raw gps points."
-msgstr "Zeichne Linien zwischen Roh GPS Punkten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
-msgid "Force lines if no segments imported."
-msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
-msgid "Draw large GPS points."
-msgstr "Zeichne große GPS Punkte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
-msgid "Draw Direction Arrows"
-msgstr "Zeichne Richtungspfeile"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-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-"
-"Informationen enthalten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
-msgid "Draw larger dots for the GPS points."
-msgstr "Zeichnet größere Punkte für GPS-Punkte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
-msgid "Draw direction hints for all segments."
-msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
-msgid "Color"
-msgstr "Farbe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
-msgid "Name"
-msgstr "Name"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
-msgid "Choose"
-msgstr "Wähle"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
-msgid "Please select a color."
-msgstr "Bitte eine Farbe wählen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
-#, java-format
-msgid "Choose a color for {0}"
-msgstr "Eine Farbe für {0} auswählen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
-msgid "Annotation preset source"
-msgstr "Voreinstellungsquelle"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
-msgid "The base URL to the OSM server (REST API)"
-msgstr "Die Basis URL des OSM Servers (REST API)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
-msgid "Login name (email) to the OSM account."
-msgstr "Benutzername (E-Mail) für den OSM Server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-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 "
-"werden soll."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
-msgid "The base URL to the server retrieving WMS background pictures from."
-msgstr "Die Basis URL für WMS Hintergrund-Bilder."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+msgid "Layer"
+msgstr "Ebene"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
+#: ../osmarender/src/OsmarenderPlugin.java:98
+#: ../osmarender/src/OsmarenderPlugin.java:104
+msgid "View"
+msgstr "Bild"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
+msgid "Files"
+msgstr "Dateien"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
+msgid "Connection"
+msgstr "Verbindung"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
+msgid "Tools"
+msgstr "Werkzeuge"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
+#, fuzzy
+msgid "Zoom To"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:28
+msgid "Projection method"
+msgstr "Projektionsmethode"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#, fuzzy
+msgid "Configure available plugins."
+msgstr "Verfügbare Plugins konfigurieren."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+msgid "Get more plugins"
+msgstr "Mehr Plugins holen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#, java-format
+msgid "Downloaded plugin information from {0} site"
+msgid_plural "Downloaded plugin information from {0} sites"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#, fuzzy
+msgid "No plugin information found."
+msgstr "Plugin nicht gefunden: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#, fuzzy
+msgid "Update current"
+msgstr "Speichere die aktuellen Daten."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+msgid "Not implemented yet."
+msgstr "Noch nicht fertig."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#, fuzzy
+msgid "Configure Plugin Sites"
+msgstr "Verfügbare Plugins konfigurieren."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:116
+msgid "Plugin bundled with JOSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:160
+#, java-format
+msgid "Error reading plugin information file: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:186
+#, fuzzy, java-format
+msgid ""
+"Download the following plugins?\n"
+"\n"
+"{0}"
+msgstr "Lade die folgenden Daten aus dem Internet:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#, fuzzy
+msgid "Download missing plugins"
+msgstr "Lade Daten aus dem Internet"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+#, fuzzy
+msgid "Advanced Preferences"
+msgstr "Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:64
+#, fuzzy
+msgid "Enter a new key/value pair"
+msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Please select the row to delete."
+msgstr "Bitte wählen Sie die löschende Zeile."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
+msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Bilder für {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Verhalten und Aussehen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1682,7 +1890,40 @@
 "ließt einfach die Länge und Breite durch Komma getrennt.</html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
-msgid ""
-"If your gps device draw to few lines, select this to draw lines along your "
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr "CSV Import Definition (leer: lese aus der ersten Zeile der Daten)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Zeichne Linien zwischen Roh GPS Punkten."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+msgid "Force lines if no segments imported."
+msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+msgid "Draw large GPS points."
+msgstr "Zeichne große GPS Punkte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+msgid "Draw Direction Arrows"
+msgstr "Zeichne Richtungspfeile"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+#, fuzzy
+msgid ""
+"If your gps device draw too few lines, select this to draw lines along your "
 "way."
 msgstr ""
@@ -1690,64 +1931,158 @@
 "werden um die Linien entlang des Weges zu vervollständigen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+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-"
+"Informationen enthalten."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Draw larger dots for the GPS points."
+msgstr "Zeichnet größere Punkte für GPS-Punkte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Draw direction hints for all segments."
+msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+msgid "Draw the order numbers of all segments within their way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#, fuzzy
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Kartendaten vom OSM Server laden"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgid "Draw the inactive data layers in a different color."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings"
+msgstr "Verbindungseinstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#, fuzzy
+msgid "Connection Settings for the OSM server."
+msgstr "Verbinungseinstellungen des OSM Servers."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Map Settings"
+msgstr "Karten-Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+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:78
+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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:53
+#, fuzzy
+msgid "Tagging preset source"
+msgstr "Voreinstellungsquelle"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#, fuzzy
+msgid ""
+"The sources (url or filename) of tagging preset definition files. See http://"
+"josm.eigenheimstrasse.de/wiki/TaggingPresets for help."
+msgstr ""
+"Die Quellen (URL oder Dateiname) für Voreinstellungsdateien. Siehe http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets für Hilfe."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#, fuzzy
+msgid "Add a new tagging preset source to the list."
+msgstr "Eine neue Voreinstellungsdatei zu der Liste hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
+msgid "Delete the selected source from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#, fuzzy
+msgid "Tagging preset sources"
+msgstr "Voreinstellungs-Quellen:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:48
+msgid "Color"
+msgstr "Farbe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:49
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Name"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
+msgid "Choose"
+msgstr "Wähle"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:122
+msgid "Please select a color."
+msgstr "Bitte eine Farbe wählen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:127
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Eine Farbe für {0} auswählen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:132
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
-msgid ""
-"The sources (url or filename) of annotation preset definition files. See "
-"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
-msgstr ""
-"Die Quellen (URL oder Dateiname) für Voreinstellungsdateien. Siehe http://"
-"josm.eigenheimstrasse.de/wiki/AnnotationPresets für Hilfe."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
-msgid "Add a new annotation preset source to the list."
-msgstr "Eine neue Voreinstellungsdatei zu der Liste hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
-msgid "Delete the selected source from the list."
-msgstr "Ausgewählte Quelle löschen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr ""
-"Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
-msgid "Look and Feel"
-msgstr "Verhalten und Aussehen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
 msgid "Colors"
 msgstr "Farben"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings"
-msgstr "Verbindungseinstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings to the OSM server."
-msgstr "Verbinungseinstellungen des OSM Servers."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
+#, fuzzy
+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:35
+msgid "Login name (email) to the OSM account."
+msgstr "Benutzername (E-Mail) für den OSM Server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+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 "
+"werden soll."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Basis Rechner URL"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
 msgid "OSM username (email)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "OSM password"
 msgstr "OSM Passwort"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1759,356 +2094,1348 @@
 "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
-msgid "CSV import specification (empty: read from first line in data)"
-msgstr "CSV Import Definition (leer: lese aus der ersten Zeile der Daten)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Map Settings"
-msgstr "Karten-Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Settings for the map projection and data interpretation."
-msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
-msgid "Projection method"
-msgstr "Projektionsmethode"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
-msgid "Annotation preset sources"
-msgstr "Voreinstellungs-Quellen:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Configure available Plugins."
-msgstr "Verfügbare Plugins konfigurieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
-msgid "Get more plugins"
-msgstr "Mehr Plugins holen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Lade Punkte {0} bis {1}..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Hole OSM-Daten...."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
-msgid "Unknown version"
-msgstr "Version unbekannt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
-msgid "Found <seg> tag on non-way."
-msgstr "<seg>-Tag auf einen Nicht-Weg gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
-msgid "Incomplete segment with id=0"
-msgstr "Unvollständiger Abschnitt mit id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
+msgid "Could not read bookmarks."
+msgstr "Kann Lesezeichen nicht lesen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
+msgid "Could not write bookmark."
+msgstr "Kann Lesezeichen nicht schreiben."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:109
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#, fuzzy
+msgid "Java OpenStreetMap - Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:147
+msgid "layer not in list."
+msgstr "Ebene nicht in der Liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+msgid "Getting Started"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
+#, fuzzy
+msgid "[Download] some data from the OSM server"
+msgstr "Kartendaten vom OSM Server laden"
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
+msgid "Getting Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:68
+msgid "Open the [online help] (english only)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+msgid "Watch some [tutorial videos]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Join the newbie [mailing list]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:191
+#, fuzzy
+msgid "Unknown type"
+msgstr "Rechner unbekannt."
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:241
+#, fuzzy, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:244
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:277
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ändere {0} Objekt"
+msgstr[1] "Ändere {0} Objekte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:307
+msgid "Change Properties"
+msgstr "Einstellungen ändern"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload Preferences"
+msgstr "Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload the current preferences to the server"
+msgstr "Kartendaten zum OSM Server speichern"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+msgid "string"
+msgstr "Zeichenkette"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+msgid "Name of the user."
+msgstr "Name des Benutzers."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+msgid "OSM Password."
+msgstr "OSM Passwort."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+#, fuzzy
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "Ändere die Größe auf den angegeben Wert (Format: Breitex Höhe)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid "string;string;..."
+msgstr "Zeichenkette;Zeichenkette;..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Lade Daten. Kann x1,y1,x2,y2; eine URL mit lat=y&lon=x&zomm=z oder ein "
+"Dateiname sein."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Alles als Roh GPS Daten speichern. Kann x1,y1,x2,y2, eine URL mit "
+"lat=y&llon=x&zoom=z oder ein Dateiname sein."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+msgstr ""
+"Alle zu der Initialen Selektion hinzufügen. Kann eine Google ähnliche "
+"Suchanfrage oder eine URL  auf ein osm-xml Dokument sein."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "any"
+msgstr "jeder"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Click Reload to refresh list"
+msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+msgid "Reload"
+msgstr "Neu Laden"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Revert"
+msgstr "Zücknehmen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "History"
+msgstr "Geschichte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "Display the history of all selected items."
+msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
+msgid "Date"
+msgstr "Datum"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:142
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
+"zurückführen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+msgid "Delete the selected layer."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:70
+msgid "Do you really want to delete the whole layer?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+msgid "Show/Hide"
+msgstr "Zeigen/Verstecken"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+msgid "Toggle visible state of the selected layer."
+msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#, fuzzy
+msgid "Show/Hide Text"
+msgstr "Zeigen/Verstecken"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#, fuzzy
+msgid "Toggle visible state of the marker text."
+msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Layers"
+msgstr "Ebenen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Öffnet eine Liste alle geladenen Ebenen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:221
+msgid "Move the selected layer one row up."
+msgstr "Gewählte Ebene eine Reihe höher schieben"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:227
+msgid "Move the selected layer one row down."
+msgstr "Gewählte Ebene eine Reihe tiefer schieben."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:241
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Merging conflicts."
+msgstr "Konflikte lösen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Resolve"
+msgstr "Lösen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
+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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid "Select"
+msgstr "Wähle aus"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
+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 "
+"ausgewählten Objekte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:109
+msgid "Please select something from the conflict list."
+msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "Resolve Conflicts"
+msgstr "Konflikte entfernen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Authors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Open a list of people working on the selected objects."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+msgid "Author"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+#, fuzzy
+msgid "# Objects"
+msgstr "Objekt"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Bitte wählen Sie die Objekte an denen die Eigenschaften geändert werden "
+"sollen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Dies wird ein {0} Objekt ändern"
+msgstr[1] "Dies wird {0} Objekte ändern."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+msgid "An empty value deletes the key."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+msgid "Change values?"
+msgstr "Wert ändern?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:394
+msgid "<different>"
+msgstr "<verschieden>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:160
+#, fuzzy, java-format
+msgid "Change properties of {0} object"
+msgid_plural "Change properties of {0} objects"
+msgstr[0] "Ändere {0} Objekt"
+msgstr[1] "Ändere {0} Objekte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+msgid "Please select objects for which you want to change properties."
+msgstr ""
+"Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+msgid "Please select a key"
+msgstr "Bitte wählen Sie einen Schlüssel"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+msgid "Please select a value"
+msgstr "Bitte wählen Sie einen Wert"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+msgid "Properties"
+msgstr "Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+#, fuzzy
+msgid "Properties for selected objects."
+msgstr "Einstellungen der Ausgewählten Objekte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+msgid "Add a new key/value pair to all objects"
+msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+msgid "Edit the value of the selected key for all objects"
+msgstr "Den Wert des Schlüssels für alle Objekte ändern"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+msgid "Delete the selected key in all objects"
+msgstr "Den Schlüssel aus allen Objekten löschen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Befehlsliste"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Current Selection"
+msgstr "Aktuelle Auswahl"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Open a selection list window."
+msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
+msgid "Error while parsing"
+msgstr "Fehler beim Parsen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+#, fuzzy
+msgid "File not found"
+msgstr "Datei wurde nicht gefunden."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:49
+msgid "You can paste an URL here to download the area."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lat"
+msgstr "min Breite"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "min lon"
+msgstr "min Länge"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lat"
+msgstr "max Breite"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+msgid "max lon"
+msgstr "max Länge"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "URL from www.openstreetmap.org"
+msgstr "URL von www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:166
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:169
+msgid "Download area ok, size probably acceptable to server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:99
+msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:64
+msgid "Please enter the desired coordinates first."
+msgstr "Bitte wählen Sie zuerst die Koordinaten."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
+msgid "Please enter a name for the location."
+msgstr "Bitte geben Sie einen Namen für den Ort an."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Select a bookmark first."
+msgstr "Bitte wählen Sie ein Lesezeichen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:74
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:106
+#, fuzzy
+msgid "Download Area"
+msgstr "Daten laden?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgid "usage"
+msgstr "Benutzung"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+msgid "options"
+msgstr "Optionen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+msgid "Show this help"
+msgstr "Zeige diese Hilfe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid "Standard unix geometry argument"
+msgstr "Standard Unix Geometrie Argument"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgid "Download the bounding box"
+msgstr "Lade den Zeichen-Kasten"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid "Download the bounding box as raw gps"
+msgstr "Lade den Zeichen-Kasten als Roh-GPS"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgid "Select with the given search"
+msgstr "Auswählen mit der angegebenen Suche"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Don't launch in fullscreen mode"
+msgstr "Nicht im Vollbildmodus starten"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "Reset the preferences to default"
+msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
+msgid "Set the language. Example: "
+msgstr "Die Sprache Einstellen. Beispiel:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "examples"
+msgstr "Beispiele"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Parameter werden in der Reihenfolge ausgewertet, wie sie angegeben werden. "
+"Stellen Sie also sicher, das Daten existieren, bevor der Parameter --"
+"selection verwendet wird."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+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/plugins/PluginDownloader.java:92
+#, java-format
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:95
+#, fuzzy, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr "Kann das Plugin {0}nicht laden."
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "Ein Fehler ist im Plugin {0} aufgetreten."
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:193
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Latitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:195
+#: ../livegps/livegps/LiveGpsDialog.java:57
+msgid "Longitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:200
+#, fuzzy
+msgid "Grid layout"
+msgstr "Ebene"
+
+#: ../grid/src/grid/GridLayer.java:222
+#, fuzzy
+msgid "Grid layer:"
+msgstr "Ebene"
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:34
+#, java-format
+msgid ""
+"Do you want to load a basic tagging preset for your language ({0})?\n"
+"This is recommend for beginners of JOSM.\n"
+"\n"
+"'Cancel' will ask this question on next start again."
+msgstr ""
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:35
+msgid "Language Plugin detected"
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:86
+msgid "FireFox not found. Please set firefox executable in the preferences."
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:135
+#, fuzzy
+msgid "osmarender options"
+msgstr "Export-Einstellungen"
+
+#: ../osmarender/src/OsmarenderPlugin.java:136
+msgid "FireFox executable"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+#, fuzzy
+msgid "Version"
+msgstr "Version"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
+#, fuzzy
+msgid "Update"
+msgstr "Daten"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+#, fuzzy
+msgid "Add Site"
+msgstr "Knotenpunkt hinzufügen"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
+msgid "Update Site Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+msgid "Invalid Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+#, fuzzy
+msgid "Delete Site(s)"
+msgstr "Knotenpunkt löschen"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+#, fuzzy
+msgid "Please select the site to delete."
+msgstr "Bitte wählen Sie die löschende Zeile."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
+#, fuzzy
+msgid "Please select the site(s) to check for updates."
+msgstr "Bitte wählen Sie mindestens vier Punkte aus."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+#, fuzzy
+msgid "Delete the selected site(s) from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
+msgid "Update Sites"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
+#, fuzzy, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+msgid "No validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+#, fuzzy
+msgid "Open the validation window."
+msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+msgid ""
+"A OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "Letzte Änderung am {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:35
+#, fuzzy
+msgid "Single node segments."
+msgstr "Knotenpunkt in einen Abschnitt einfügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:36
+msgid ""
+"This test checks that there are no segments with the same node as start and "
+"destination."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:44
+#, fuzzy
+msgid "Single node segments"
+msgstr "Knotenpunkt in einen Abschnitt einfügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+#, fuzzy
+msgid "Untagged nodes."
+msgstr "Daten nicht gespeichert"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+msgid "This test checks for untagged nodes that are not part of any segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:97
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:30
+msgid "Crossing roads."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:31
+msgid ""
+"This test checks if two roads,railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:83
+msgid "Crossing roads"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:26
+#, fuzzy
+msgid "Reused segments."
+msgstr "Richtung ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:27
+msgid "This test checks if a segment is used in more than one way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:45
+#, fuzzy
+msgid "Reused segments"
+msgstr "Richtung ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
+#, fuzzy
+msgid "Tagged segments"
+msgstr "Abschnitte"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:30
+msgid "This test checks that no segment is tagged. Only ways should be tagged."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:45
+msgid "Segments with tags"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:29
+msgid "Similar named ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:30
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:75
+msgid "Similar named ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Entferne \"{0}\" für"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:29
+msgid "Duplicated segments."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:30
+msgid "This test checks that two nodes are not used by more than one segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:48
+#, fuzzy
+msgid "Duplicated segments"
+msgstr "Abschnitt hinzufügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:22
+msgid "Unordered ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:23
+msgid "This test checks that all segments in a way are properly ordered."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:34
+msgid "Unordered ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:111
+#, fuzzy
+msgid "Properties checker."
+msgstr "Einstellungen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:112
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:178
+#, fuzzy, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr "Kann die Datei \"{0}\" nicht umbenennen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:241
+msgid "Tags with empty values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:246
+msgid "Invalid property keys"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:254
+msgid "Unknown property values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:262
+msgid "FIXMES"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:370
+#, fuzzy
+msgid "Check property keys."
+msgstr "Einstellungen ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:371
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:403
+msgid "Spellcheck source"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:423
+#, fuzzy
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+msgstr ""
+"Die Quellen (URL oder Dateiname) für Voreinstellungsdateien. Siehe http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets für Hilfe."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+#, fuzzy
+msgid "Add a new spellcheck source to the list."
+msgstr "Eine neue Voreinstellungsdatei zu der Liste hinzufügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:425
+#, fuzzy
+msgid "Edit the selected source."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:428
+msgid "Spellcheck data sources"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:450
+#, fuzzy
+msgid "Check property values."
+msgstr "Einstellungen ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:451
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:459
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:460
+msgid "Looks for nodes, segments or ways with FIXME in any property value."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:28
+#, fuzzy
+msgid "Orphaned segments."
+msgstr "Abschnitt hinzufügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:29
+msgid "This test checks that every segment is in a way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:44
+#, fuzzy
+msgid "Segments not in a way"
+msgstr "Abschnitte zum Weg hinzufügen?"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:37
+#, fuzzy
+msgid "Untagged ways."
+msgstr "Bilder mit Ortsbezug"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:38
+msgid "This test checks for untagged ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:66
+#, fuzzy
+msgid "Unnamed ways"
+msgstr "unbenannt"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
+#, fuzzy
+msgid "Untagged ways"
+msgstr "Bilder mit Ortsbezug"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+msgid "Duplicated nodes."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:109
+#, fuzzy
+msgid "Nodes have conflicting key: "
+msgstr "Schlüsselkonflikt"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
+#, fuzzy
+msgid "Merge Nodes"
+msgstr "Knotenpunkt löschen"
+
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
+msgid "WMS"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
+"operieren."
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+#, fuzzy
+msgid "WMS Plugin Preferences"
+msgstr "Einstellungen"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:24
+#, fuzzy
+msgid "Downloading "
+msgstr "Lade Daten aus dem Internet"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
+msgid ""
+"<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
+"<b>must</b> be configured with the javascript 'dump' method,<br>that can be "
+"activated with the property 'browser.dom.window.dump.enabled=true' in the "
+"about:config page.</html>"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
+msgid ""
+"<html>The port that the server will use to listen WMS requests<br>The WMS "
+"plugin need to be configured to use this port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
+msgid ""
+"<html>Name of the profile.<br>This profile is used to avoid nag firefox "
+"screens asking you to resume failed sessions.<br>Just set the selected "
+"profile as not default in the profile selection window and configure to not "
+"ask<br>about failed sessions with 'browser.sessionstore."
+"resume_from_crash=false' in the about:config page"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Yahoo! WMS server"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Settings for the Yahoo! imagery server."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
+#, fuzzy
+msgid "YWMS options"
+msgstr "Optionen"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
+msgid "Firefox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
+msgid "Firefox profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
+#, fuzzy
+msgid "Create"
+msgstr "Neuen Weg erstellen"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
+msgid "Server port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
+#, fuzzy
+msgid "Please name the profile you want to create."
+msgstr ""
+"Bitte wählen Sie die Objekte an denen die Eigenschaften geändert werden "
+"sollen."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
+msgid "Creating profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
+msgid "You have to select some segments that don't belong to any way."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy, java-format
+msgid "Create {0} way from {1} segments?"
+msgid_plural "Create {0} ways from {1} segments?"
+msgstr[0] "Soll ein neuer Weg aus {0} Abschnitt erstellt werden."
+msgstr[1] "Soll ein neuer Weg aus {0} Abschnitten erstellt weden."
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy
+msgid "Create ways"
+msgstr "Neuen Weg erstellen"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:82
+#, fuzzy
+msgid "Create linear ways"
+msgstr "Neuen Weg erstellen"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "Weg"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, fuzzy, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Kann die URL \"{0}\" nicht lesen"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:56
+msgid "start"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:58
+msgid "end"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:43
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:53
+msgid "Center Once"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:64
+msgid "Auto-Center on current position"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:95
+#: ../livegps/livegps/LiveGpsAcquirer.java:110
+#, fuzzy
+msgid "Connecting"
+msgstr "Verbindung"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:169
+#, fuzzy
+msgid "Connected"
+msgstr "Verbindung"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:181
+#: ../livegps/livegps/LiveGpsAcquirer.java:196
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:190
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Verbindung"
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Roh GPS-Daten"
+
+#: ../livegps/livegps/LiveGpsDialog.java:51
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#, fuzzy
+msgid "Way Info"
+msgstr "Info"
+
+#: ../livegps/livegps/LiveGpsDialog.java:59
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:61
+#, fuzzy
+msgid "Course"
+msgstr "Wähle"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid "Tagging Preset Tester"
+msgstr "Voreinstellungsquellen Tester"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+"Statret den Voreinstellungsquellen Test Werkzeug um diese aus zu probieren."
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+#, fuzzy
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr ""
+"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
+"werden."
+
+#: ../namefinder/namefinder/PlaceSelection.java:39
+#, fuzzy
+msgid "Search..."
+msgstr "Suche"
+
+#: ../namefinder/namefinder/PlaceSelection.java:101
 msgid "NullPointerException. Possible some missing tags."
 msgstr "NullPointerException. Vielleicht fehlende Tags."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
-msgid "Illegal object with id=0"
-msgstr "Illegales Objekt mit id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr "Kann das Zeit-Format \"{0}\" nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
-msgid "Preparing data..."
-msgstr "Breite Daten vor ...."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
-msgid "Illformed Node id"
-msgstr "Kranken Knotenpunkt Id"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
-#, java-format
-msgid "Upload {0} {1} ({2})..."
-msgstr "Überspiele {0} {1} ({2})..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
-msgid "Unknown host"
-msgstr "Rechner unbekannt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
-#: ../../plugins/waypoints/src/WaypointReader.java:55
+#: ../namefinder/namefinder/PlaceSelection.java:150
+msgid "Cannot read place search results from server"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:159
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:166
+msgid "Places"
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:55
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr "Daten Fehler: lat Wert \"{0}\" hat eine Grenze überschritten."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
-#: ../../plugins/waypoints/src/WaypointReader.java:59
+#: ../waypoints/src/WaypointReader.java:59
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
-msgid "Could not detect data format string."
-msgstr "Kann das Format nicht ermitteln."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
-msgid ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-msgstr ""
-"Die Format Zeile in dem Daten ist unvollständig oder nicht vorhanden. "
-"Versuchen sie das Format in den Einstellungen einzustellen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-"Die Format -Zeile ist unvollständig. Brauche mindestens 'lat' und 'lon' "
-"Spalten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-#, java-format
-msgid "Unknown data type: \"{0}\"."
-msgstr "Unbekannter Datentyp \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-msgid "Maybe add an format string in preferences."
-msgstr "Vielleicht sollte das Format in den Einstellungen festgelegt werden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr "Fehler beim parsen der Zeile {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
-msgid "Incorrect password or username."
-msgstr "Passwort oder Benutzername falsch."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Save user and password (unencrypted)"
-msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
-msgid "Enter Password"
-msgstr "Passwort eingeben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
-msgid "Aborting..."
-msgstr "Abbruch..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-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 ""
-"Daten-Fehler: Knotenpunkt {0} ist gelöscht, aber Teil des Abschnittes {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr "Fehler beim parsen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr "Position"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr "verschieden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr "gelöscht"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr "wahr"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr "falsch"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr "nichts"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr "Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
-msgid "to"
-msgstr "bis"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
-msgid "from"
-msgstr "von"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "new"
-msgstr "neu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "unknown"
-msgstr "unbekannt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} Knotenpunkt"
-msgstr[1] "{0} Knotenpunkte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
-msgid "incomplete"
-msgstr "unvollständig"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-msgid "background"
-msgstr "Hintergrund"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
-msgid "incomplete way"
-msgstr "unvollständiger Weg"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
-msgid "selected"
-msgstr "gewählt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
-msgid "gps point"
-msgstr "GPS Punkt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
-msgid "scale"
-msgstr "Skala"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Löse {0} Konflikte in {1} Objekten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr "Ändere"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
-msgid "Sequence"
-msgstr "Abfolge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr "Entferne \"{0}\" für"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr "Setze {0}={1} für"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "Objekt"
-msgstr[1] "Objekte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
-#, java-format
-msgid "Plugin not found: {0}."
-msgstr "Plugin nicht gefunden: {0}."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, java-format
-msgid "Could not load plugin {0}."
-msgstr "Kann das Plugin {0}nicht laden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
-msgid "unnamed"
-msgstr "unbenannt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271
-msgid "The projection could not be read from preferences. Using EPSG:4263."
-msgstr ""
-"Die Projektion kann nicht aus den Einstellungen ermittelt werden. Benutze "
-"RPSG:4263."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignoriere die ungültige URL: \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
-
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:102
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:108
-msgid "View"
-msgstr "Bild"
-
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:18
-msgid "Landsat background images"
-msgstr "Landsat Hintergundbilder."
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr ""
-"Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
-"operieren."
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:70
-#, java-format
-msgid "WMS layer: {0}"
-msgstr "WMS-Ebene: {0}"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr "Voreinstellungsquellen Tester"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr ""
-"Statret den Voreinstellungsquellen Test Werkzeug um diese aus zu probieren."
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
-"werden."
-
-#: ../../plugins/grid/src/grid/GridLayer.java:74
-#, fuzzy
-msgid "Grid layer:"
-msgstr "Ebene"
-
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open waypoints file"
 msgstr "Datei öffnen."
 
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open a waypoints file."
 msgstr "Datei öffnen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#, fuzzy
+msgid "Please select a scheme to use."
+msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
+#, fuzzy
+msgid "Please select the scheme to delete."
+msgstr "Bitte wählen Sie die löschende Zeile."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
+#, fuzzy
+msgid "Use the selected scheme from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#, fuzzy
+msgid "Use the current colors as a new color scheme."
+msgstr "Speichere die aktuellen Daten als neue Datei."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#, fuzzy
+msgid "Delete the selected scheme from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#, fuzzy
+msgid "Color Schemes"
+msgstr "Farben"
+
+#~ msgid "Add Node into Segment"
+#~ msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
+
+#~ msgid "Executing {0}"
+#~ msgstr "Erledige {0}"
+
+#~ msgid "The Tool requires some data to be loaded."
+#~ msgstr "Für das Werkzeug ist es nötig das Daten geladen sind."
+
+#~ msgid "Could not execute command: {0}"
+#~ msgstr "Kann \"{0}\" nicht ausführen."
+
+#~ msgid "Could not read external tool configuration."
+#~ msgstr "Kann die externen Werkzeugeinstellungen nicht lesen."
+
+#~ msgid ""
+#~ "Move and zoom the image like the main map. Select an area to download by "
+#~ "dragging."
+#~ msgstr ""
+#~ "Sie können verschieben und Zoomen wie auf der Hauptkarte. Wählen Sie den "
+#~ "zu ladenden Bereich durch einfügen."
+
+#~ msgid "Bounding box"
+#~ msgstr "Zeichen-Box"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Lesezeichen"
+
+#~ msgid "Choose an area"
+#~ msgstr "Bereich auswählen"
+
+#~ 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."
+
+#~ msgid "Auto Scale: {0}"
+#~ msgstr "Automatisch skalieren: {0}"
+
+#~ msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+#~ msgstr ""
+#~ "Den Bereich automatisch zoomen (nach {0}. Ausgeschaltet wenn der Bereich "
+#~ "bewegt wird)"
+
+#~ msgid ""
+#~ "The plugin {0} throwed an exception: {1}\n"
+#~ "It may be outdated. Please contact the plugin's autor.\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Please send this to josm@eigenheimstrasse.de\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bitte senden Sie diesen an josm@eigenheimstrasse.de\n"
+#~ "\n"
+
+#~ 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 Eintrag.)"
+
+#~ msgid "Unknown type at line {0}"
+#~ msgstr "Unbekannter Typ in Zeile {0}"
+
+#~ msgid "Cannot have a writable combobox with default values (line {0})"
+#~ msgstr "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
+
+#~ 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 haben."
+
+#~ msgid "element"
+#~ msgid_plural "elements"
+#~ msgstr[0] "Element"
+#~ msgstr[1] "Elemente"
+
+#~ msgid "Unknown annotation object {0} at line {1} column {2}"
+#~ msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
+
+#~ msgid "The base URL to the server retrieving WMS background pictures from."
+#~ msgstr "Die Basis URL für WMS Hintergrund-Bilder."
+
+#~ msgid "Landsat background images"
+#~ msgstr "Landsat Hintergundbilder."
+
+#~ msgid "WMS layer: {0}"
+#~ msgstr "WMS-Ebene: {0}"
Index: /applications/editors/josm/plugins/lang/en_GB/en_GB.po
===================================================================
--- /applications/editors/josm/plugins/lang/en_GB/en_GB.po	(revision 3651)
+++ /applications/editors/josm/plugins/lang/en_GB/en_GB.po	(revision 3652)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-22 21:32+0200\n"
+"POT-Creation-Date: 2007-07-21 14:05+0200\n"
 "PO-Revision-Date: 14/10/2006 18:36+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -17,110 +17,466 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
-msgid "Add segment"
-msgstr "Add segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
-msgid "Add a segment between two nodes."
-msgstr "Add a segment between two nodes."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-msgid "Delete"
-msgstr "Delete"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr "Delete nodes, streets or segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr "Cannot delete node."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr "This object is in use."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr "Used by more than two segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr "Used by only one segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr "Wrong direction of segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr "Conflicting keys"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr "Segments are part of different ways."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr "Delete Node"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-msgstr "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "from"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "to"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "none"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "segments"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "position"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "different"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "deleted"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "true"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "false"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:183
+msgid "background"
+msgstr "background"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:184
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:70
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "node"
+msgstr[1] "nodes"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "segment"
+msgstr[1] "segments"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "way"
+msgstr[1] "ways"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+msgid "incomplete way"
+msgstr "incomplete way"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+msgid "selected"
+msgstr "selected"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+msgid "gps point"
+msgstr "gps point"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "conflict"
+msgstr "conflict"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+msgid "scale"
+msgstr "scale"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#, fuzzy, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferences"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
+#, fuzzy, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Cannot open preferences directory: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+msgid "new"
+msgstr "new"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:106
+msgid "unknown"
+msgstr "unknown"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:91
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} node"
+msgstr[1] "{0} nodes"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:94
+msgid "incomplete"
+msgstr "incomplete"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:227
+#, java-format
+msgid "Plugin not found: {0}."
+msgstr "Plugin not found: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:255
+#, java-format
+msgid "Could not load plugin {0}."
+msgstr "Could not load plugin {0}."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:316
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr "The projection could not be read from preferences. Using EPSG:4263."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:386
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr "Hint: Some changes came from uploading new data to the server."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:388
+#, fuzzy
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr "There are unsaved changes. Really quit?"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:389
+msgid "Unsaved Changes"
+msgstr "Unsaved Changes"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:401
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignoring malformed url: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignoring malformed file url: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload to OSM"
+msgstr "Upload to OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload all changes to the OSM server."
+msgstr "Upload all changes to the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Objects to add:"
+msgstr "Objects to add:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+msgid "Objects to modify:"
+msgstr "Objects to modify:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+msgid "Objects to delete:"
+msgstr "Objects to delete:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
+#, fuzzy
+msgid "Upload these changes?"
+msgstr "Upload these changes?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Nothing to upload. Get some data first."
+msgstr "Nothing to upload. Get some data first."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr "There are unresolved conflicts. You have to resolve these first."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
+msgid "No changes to upload."
+msgstr "No changes to upload."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
+msgid "Uploading data"
+msgstr "Uploading data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
+msgid "Rename layer"
+msgstr "Rename layer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Also rename the file"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Could not rename the file \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect All"
+msgstr "selected"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect all objects."
+msgstr "Delete the selected key in all objects"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
+#, fuzzy
+msgid "Align Nodes in Line"
+msgstr "Align Nodes in Circle"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#, fuzzy
+msgid "Move the selected nodes onto a line."
+msgstr "Move the selected nodes into a circle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
+#, fuzzy
+msgid "Please select at least three nodes."
+msgstr "Please select at least four nodes."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Files (.osm .xml)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#, fuzzy
+msgid "GPX Files (.gpx .gpx.gz)"
+msgstr "GPX Files (.gpx)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Files (.csv .txt)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr "Align Nodes in Circle"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr "Move the selected nodes into a circle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
+msgstr "Please select at least four nodes."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save"
+msgstr "Save"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save the current data."
+msgstr "Save the current data."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
+msgid "data"
+msgstr "data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
+msgid "selection"
+msgstr "selection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
+msgid "layer"
+msgstr "layer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom to {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "New"
+msgstr "new"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "Create a new map."
+msgstr "Create new way"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr "unnamed"
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine several ways into one."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#, fuzzy
+msgid "Please select at least two ways to combine."
+msgstr "Please select at least one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:91
+msgid "Enter values for all conflicts."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:100
+#, java-format
+msgid "Combine {0} ways"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+msgid "Help"
+msgstr "Help"
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "Can only edit help pages from JOSM Online Help"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+msgid "Open a preferences page for global settings."
+msgstr "Open a preferences page for global settings."
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Redo"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Redo the last undone action."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save as"
+msgstr "Save as"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save the current data to a new file."
+msgstr "Save the current data to a new file."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+#, fuzzy
+msgid "Reorder Segments"
+msgstr "Reverse Segments"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+msgid ""
+"Try to reorder segments of a way so that they are in a line. May try to flip "
+"segments around to match a line."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:41
+#, fuzzy
+msgid "Please select at least one way."
+msgstr "Please select at least one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
+#, fuzzy
+msgid "Reorder segments"
+msgstr "Reorder all line segments?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
+#, fuzzy
+msgid "The selected way is incomplete or has only one segment."
+msgid_plural ""
+"None of the selected ways are complete and have more than one segment."
+msgstr[0] "Please select at least one segment."
+msgstr[1] "Please select at least one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
+#, fuzzy, java-format
+msgid "Reorder segments for way {0}"
+msgstr "Add segments from ways"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add node"
+msgstr "Add node"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add a new node to the map"
+msgstr "Add a new node to the map"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:142
+msgid "Add node into segment"
+msgstr "Add node into segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+msgid "Add a node into an existing segment"
+msgstr "Add a node into an existing segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:167
+#, fuzzy
+msgid "Add node and connect"
+msgstr "Add node into segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+msgid "Add a node and connect it to the selected (previously added) node"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
+msgid "Can not add a node outside of the world."
+msgstr "Can not add a node outside of the world."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Selection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects by dragging or clicking."
 msgstr "Select objects by dragging or clicking."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Straight line"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Select objects in a straight line."
 msgstr "Select objects in a straight line."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Move"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr "Move around objects that are under the mouse or selected."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr "Cannot move objects outside of the world."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add Way"
 msgstr "Add Way"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add a new way to the data."
 msgstr "Add a new way to the data."
 
-#: ../../../../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."
-msgstr ""
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#, fuzzy
+msgid ""
 "Warning: This way is incomplete. Try to download it before adding segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+msgstr ""
+"Warning: This way is incomplete. Try to download it before adding segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, fuzzy, java-format
 msgid ""
@@ -141,26 +497,26 @@
 "Do you wish to select all segments belonging to the ways instead?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Add segments from ways"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/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 ""
 "Do you want to add all other selected segments to the one selected way?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Add segments to way?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Reorder all line segments?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Reorder?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -169,680 +525,304 @@
 msgstr[1] "Create a new way out of {0} segments?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 msgid "Create new way"
 msgstr "Create new way"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add node"
-msgstr "Add node"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add a new node to the map"
-msgstr "Add a new node to the map"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add node into segment"
-msgstr "Add node into segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add a node into an existing segment"
-msgstr "Add a node into an existing segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
-msgid "Can not add a node outside of the world."
-msgstr "Can not add a node outside of the world."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
-msgid "Add Node into Segment"
-msgstr "Add Node into Segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr "Raw GPS data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Downloading GPS data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:21
-msgid "Downloading data"
-msgstr "Downloading data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "No data imported."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Data Layer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+msgid "Delete"
+msgstr "Delete"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr "Delete nodes, streets or segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr "Cannot delete node."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr "This object is in use."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr "Used by more than two segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr "Used by only one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Wrong direction of segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Conflicting keys"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr "Segments are part of different ways."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
+msgstr "Delete Node"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Move"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr "Move around objects that are under the mouse or selected."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
+msgstr "Cannot move objects outside of the world."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#, fuzzy
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
+msgstr "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+msgid "Add segment"
+msgstr "Add segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+msgid "Add a segment between two nodes."
+msgstr "Add a segment between two nodes."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download from OSM"
+msgstr "Download from OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download map data from the OSM server."
+msgstr "Download map data from the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
+#, fuzzy
+msgid "Download"
+msgstr "Download?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
+#, fuzzy
+msgid "Please select at least one task to download"
+msgstr "Please select at least one download data type."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse segments"
+msgstr "Reverse Segments"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse the direction of all selected Segments."
+msgstr "Revert the direction of all selected Segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:44
+msgid "Please select at least one segment."
+msgstr "Please select at least one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:55
 msgid "Reverse Segments"
 msgstr "Reverse Segments"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-msgid "Revert the direction of all selected Segments."
-msgstr "Revert the direction of all selected Segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
-msgid "Please select at least one segment."
-msgstr "Please select at least one segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
-msgid "Preferences"
-msgstr "Preferences"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-msgid "Open a preferences page for global settings."
-msgstr "Open a preferences page for global settings."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open"
-msgstr "Open"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open a file."
-msgstr "Open a file."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr "CSV Data import for non-GPS data is not implemented yet."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Unknown file extension: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:59
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Error while parsing {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:63
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Could not read \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr "Executing {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr "The Tool requires some data to be loaded."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr "Could not execute command: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr "Tools"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-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 "Align Nodes in Circle"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr "Move the selected nodes into a circle."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-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 "Rename layer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Also rename the file"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Could not rename the file \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "File exists. Overwrite?"
+msgstr "File exists. Overwrite?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit"
+msgstr "Exit"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit the application."
+msgstr "Exit the application."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+#, fuzzy
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Note: The GPL is not compatible with the OSM licence. Do not upload GPL "
+"licensed tracks."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Export to GPX"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Export the data to GPX file."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nothing to export. Get some data first."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "gps track description"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Add author information"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Real name"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "Email"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Predefined"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Copyright year"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Keywords"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Export options"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:78
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:62
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Error while exporting {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:79
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+msgid "Error"
+msgstr "Error"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Choose a predefined license"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Undo"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Undo the last action."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download from OSM"
-msgstr "Download from OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download map data from the OSM server."
-msgstr "Download map data from the OSM server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
-msgid ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-msgstr ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
-msgid "Bounding box"
-msgstr "Bounding box"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
-msgid "min lat"
-msgstr "min lat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
-msgid "min lon"
-msgstr "min lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
-msgid "max lat"
-msgstr "max lat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
-msgid "max lon"
-msgstr "max lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-msgid "Download the following data:"
-msgstr "Download the following data:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
-msgid "URL from www.openstreetmap.org"
-msgstr "URL from www.openstreetmap.org"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
-msgid "Bookmarks"
-msgstr "Bookmarks"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
-msgid "Add"
-msgstr "Add"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
-msgid "Please enter the desired coordinates first."
-msgstr "Please enter the desired coordinates first."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
-msgid "Please enter a name for the location."
-msgstr "Please enter a name for the location."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
-msgid "Remove"
-msgstr "Remove"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
-msgid "Select a bookmark first."
-msgstr "Select a bookmark first."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
-msgid "Choose an area"
-msgstr "Choose an area"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
-msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr "Please enter the desired coordinates or click on a bookmark."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-msgid "Please select at least one download data type."
-msgstr "Please select at least one download data type."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit"
-msgstr "Exit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit the application."
-msgstr "Exit the application."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "About"
-msgstr "About"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "Display the about screen."
-msgstr "Display the about screen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
-#, java-format
-msgid "Java OpenStreetMap Editor Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#, java-format
-msgid "last change at {0}"
-msgstr "last change at {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, java-format
-msgid "Java Version {0}"
-msgstr "Java Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
-msgid "Homepage"
-msgstr "Homepage"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
-msgid "Bug Reports"
-msgstr "Bug Reports"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "News about JOSM"
-msgstr "News about JOSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
-msgid "Info"
-msgstr "Info"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "Readme"
-msgstr "Readme"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
-msgid "Revision"
-msgstr "Revision"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-msgid "Contribution"
-msgstr "Contribution"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
-msgid "About JOSM..."
-msgstr "About JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
-msgid "File could not be found."
-msgstr "File could not be found."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr "No document open so nothing to save."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr "The document contains no data. Save anyway?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr "Empty document"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr "Conflicts"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "File exists. Overwrite?"
-msgstr "File exists. Overwrite?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-msgid "data"
-msgstr "data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-msgid "selection"
-msgstr "selection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
-msgid "layer"
-msgstr "layer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
-msgid "conflict"
-msgstr "conflict"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
-#, java-format
-msgid "Auto Scale: {0}"
-msgstr "Auto Scale: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
-#, java-format
-msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
-msgstr "Auto zoom the view (to {0}. Disabled if the view is moved)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Save as"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Save the current data to a new file."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "OSM Server Files (.osm .xml)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "GPX Files (.gpx)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "CSV Files (.csv .txt)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload to OSM"
-msgstr "Upload to OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload all changes to the OSM server."
-msgstr "Upload all changes to the OSM server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
-msgid "Nothing to upload. Get some data first."
-msgstr "Nothing to upload. Get some data first."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr "There are unresolved conflicts. You have to resolve these first."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Uploading data"
-msgstr "Uploading data"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
-msgid "No changes to upload."
-msgstr "No changes to upload."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Objects to add:"
-msgstr "Objects to add:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
-msgid "Objects to modify:"
-msgstr "Objects to modify:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
-msgid "Objects to delete:"
-msgstr "Objects to delete:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
-msgid "Upload this changes?"
-msgstr "Upload these changes?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:54
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr "Help"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:106
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Can only edit help pages from JOSM Online Help"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, java-format
-msgid "Downloading {0} segment"
-msgid_plural "Downloading {0} segments"
-msgstr[0] "Downloading {0} segment"
-msgstr[1] "Downloading {0} segments"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+#, fuzzy
+msgid "Select All"
+msgstr "Select"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
+#, fuzzy, java-format
+msgid "Downloading {0} way"
+msgid_plural "Downloading {0} ways"
+msgstr[0] "Downloading {0} {1}"
+msgstr[1] "Downloading {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download incomplete objects"
 msgstr "Download incomplete objects"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr "Download all (selected) incomplete ways from the OSM server."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
 msgid "Please select an incomplete way."
 msgstr "Please select an incomplete way."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 #, java-format
 msgid "Download {0} incomplete ways?"
 msgstr "Download {0} incomplete ways?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 msgid "Download?"
 msgstr "Download?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Redo"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Redo the last undone action."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Note: The GPL is not compatible with the OSM licence. Do not upload GPL "
-"licensed tracks."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Export to GPX"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Export the data to GPX file."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nothing to export. Get some data first."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "gps track description"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Add author information"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Real name"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "Email"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Predefined"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Copyright year"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Keywords"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Export options"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Error while exporting {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Error"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Choose a predefined license"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr "Save"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr "Save the current data."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr "CSV output not supported yet."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr "Unknown file extension."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr "An error occoured while saving."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
-#, java-format
-msgid ""
-"The plugin {0} throwed an exception: {1}\n"
-"It may be outdated. Please contact the plugin's autor.\n"
-"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
-msgid "Do nothing"
-msgstr "Do nothing"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Report Bug"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occoured.\n"
-"\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."
-msgstr ""
-"An unexpected exception occured.\n"
-"\n"
-"This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider being kind and file a bug report."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Unexpected Exception"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
-msgid "Ctrl-"
-msgstr "Ctrl-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
-msgid "Alt-"
-msgstr "Alt-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
-msgid "AltGr-"
-msgstr "AltGr-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "Shift-"
-msgstr "Shift-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "An error occoured in plugin {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
 msgid "Load Selection"
 msgstr "Load Selection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Could not read from url: \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Parsing error in url: \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Current Selection"
-msgstr "Current Selection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Open a selection list window."
-msgstr "Open a selection list window."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "Search"
+msgstr "Search"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+msgid "Search for objects."
+msgstr "Search for objects."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
+#, fuzzy
+msgid "No data loaded."
+msgstr "No data imported."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -858,324 +838,618 @@
 "li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 msgid "replace selection"
 msgstr "replace selection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "add to selection"
 msgstr "add to selection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "remove from selection"
 msgstr "remove from selection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
-msgid "Search"
-msgstr "Search"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Conflict"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Merging conflicts."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Resolve"
-
-#: ../../../../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 "Open a merge dialog of all selected items in the list above."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr "Select"
-
-#: ../../../../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."
-msgstr ""
-"Set the selected elements on the map to the selected items in the list above."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
-msgid "Please select something from the conflict list."
-msgstr "Please select something from the conflict list."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-msgid "Resolve Conflicts"
-msgstr "Resolve Conflicts"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "Click Reload to refresh list"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Reload"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Revert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "History"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Display the history of all selected items."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:59
+msgid "No document open so nothing to save."
+msgstr "No document open so nothing to save."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "The document contains no data. Save anyway?"
+msgstr "The document contains no data. Save anyway?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "Empty document"
+msgstr "Empty document"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid "Conflicts"
+msgstr "Conflicts"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "CSV output not supported yet."
+msgstr "CSV output not supported yet."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+msgid "Unknown file extension."
+msgstr "Unknown file extension."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:108
+#, fuzzy
+msgid "An error occurred while saving."
+msgstr "An error occoured while saving."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+msgid "Split Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+#, fuzzy
+msgid "Split a way at the selected node."
+msgstr "Delete the selected layer."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgid "The current selection cannot be used for splitting."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:160
+#, fuzzy
+msgid "The selected node is not part of any way."
+msgid_plural "The selected nodes are not part of any way."
+msgstr[0] "Move the selected nodes into a circle."
+msgstr[1] "Move the selected nodes into a circle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+msgid ""
+"There is more than one way using the node(s) you selected. Please select the "
+"way also."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:176
+#, fuzzy
+msgid "The selected nodes do not share the same way."
+msgstr "Move the selected nodes into a circle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:190
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:210
+msgid "The selected segment is not part of any way."
+msgid_plural "The selected segments are not part of any way."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+msgid ""
+"There is more than one way using the segment you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the segments you selected. Please select "
+"the way also."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:228
+msgid "The selected segments do not share the same way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#, fuzzy
+msgid "The selected way does not contain the selected segment."
+msgid_plural "The selected way does not contain all the selected segments."
+msgstr[0] "Please select at least one segment."
+msgstr[1] "Please select at least one segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:245
+#, fuzzy
+msgid "Warning: This way is incomplete. Try to download it before splitting."
+msgstr ""
+"Warning: This way is incomplete. Try to download it before adding segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:360
+msgid "The selected segments are not in the same contiguous part of the way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:373
+msgid ""
+"Removing the selected segments would make a part of the way non-contiguous."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:410
+msgid ""
+"The way cannot be split at the selected node. (Hint: To split circular ways, "
+"select two nodes.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:412
+msgid ""
+"The way cannot be split because it is contiguous. (Hint: To split at a node, "
+"select that node.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "About"
+msgstr "About"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Display the about screen."
+msgstr "Display the about screen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#, java-format
+msgid "last change at {0}"
+msgstr "last change at {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
+msgid "Homepage"
+msgstr "Homepage"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Bug Reports"
+msgstr "Bug Reports"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "News about JOSM"
+msgstr "News about JOSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
+msgid "Readme"
+msgstr "Readme"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
+msgid "Revision"
+msgstr "Revision"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
+msgid "Contribution"
+msgstr "Contribution"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+msgid "About JOSM..."
+msgstr "About JOSM..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "File could not be found."
+msgstr "File could not be found."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open"
+msgstr "Open"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open a file."
+msgstr "Open a file."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:67
+#: ../waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Error while parsing {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:70
+#: ../waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Could not read \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:81
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr "CSV Data import for non-GPS data is not implemented yet."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Unknown file extension: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:104
+#, fuzzy, java-format
+msgid "Tracks from {0}"
+msgstr "Images for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
+#, fuzzy, java-format
+msgid "Markers from {0}"
+msgstr "Images for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:29
+msgid "Downloading data"
+msgstr "Downloading data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:41
+msgid "No data imported."
+msgstr "No data imported."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
+msgid "Data Layer"
+msgstr "Data Layer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:50
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:27
+msgid "Downloading GPS data"
+msgstr "Downloading GPS data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Raw GPS data"
+msgstr "Raw GPS data"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:23
+#, fuzzy
+msgid "Do not show again"
+msgstr "Do nothing"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
+#, fuzzy
+msgid "Information"
+msgstr "Add author information"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:61
+#, java-format
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+msgid "Should the plugin be disabled?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+msgid "Disable plugin"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+msgid ""
+"The plugin could not be removed. Please tell the people you got JOSM from "
+"about the problem."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Report Bug"
+msgstr "Report Bug"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+msgstr ""
+"An unexpected exception occured.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+msgid "Unexpected Exception"
+msgstr "Unexpected Exception"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:124
+msgid "The text has already been copied to your clipboard."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Ctrl-"
+msgstr "Ctrl-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "Alt-"
+msgstr "Alt-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
+msgid "Shift-"
+msgstr "Shift-"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
+#, fuzzy
+msgid "Downloading incomplete ways..."
+msgstr "Download {0} incomplete ways?"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
+msgid "Fix data errors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
+#, fuzzy, java-format
+msgid "Segment {0} is deleted but part of Way {1}"
+msgstr "Data error: Segment {0} is deleted but part of Way {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
+#, fuzzy
+msgid "Data error"
+msgstr "Data Layer"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr "Data error: Segment {0} is deleted but part of Way {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr "Data error: Node {0} is deleted but part of Segment {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
+#, fuzzy, java-format
+msgid "Data error: lat value \"{0}\" is out of bounds."
+msgstr "Data error: lat value \"{0}\" is out of bound."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
+#, fuzzy, java-format
+msgid "Data error: lon value \"{0}\" is out of bounds."
+msgstr "Data error: lon value \"{0}\" is out of bound."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Upload {0} {1} ({2})..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+msgid "Unknown host"
+msgstr "Unknown host"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Could not detect data format string."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#, fuzzy
+msgid ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in preferences."
+msgstr ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in Preferences."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Unknown data type: \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, fuzzy
+msgid "Maybe add a format string in preferences."
+msgstr "Maybe add an format string in preferences."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Parsing error in line {0}"
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
+#, fuzzy
+msgid "Contacting OSM Server..."
+msgstr "Contacting the OSM server..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Downloading points {0} to {1}..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+msgid "Downloading OSM data..."
+msgstr "Downloading OSM data..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:116
+msgid "Unknown version"
+msgstr "Unknown version"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:145
+msgid "Found <seg> tag on non-way."
+msgstr "Found <seg> tag on non-way."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
+msgid "Incomplete segment with id=0"
+msgstr "Incomplete segment with id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
+#, fuzzy
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException. Possible some missing tags."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+msgid "Illegal object with id=0"
+msgstr "Illegal object with id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#, fuzzy
+msgid "Couldn't read time format \"{0}\"."
+msgstr "Couldn't read time format \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:220
+#, fuzzy, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr "Missing required attribute \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+msgid "Preparing data..."
+msgstr "Preparing data..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+msgid "Illformed Node id"
+msgstr "Ill-formed Node id"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Error during parse."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Incorrect password or username."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
+msgid "Username"
+msgstr "Username"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+msgid "Password"
+msgstr "Password"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Warning: The password is transferred unencrypted."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
+msgid "Save user and password (unencrypted)"
+msgstr "Save user and password (unencrypted)"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
+msgid "Aborting..."
+msgstr "Aborting..."
+
+#: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+msgid "Add"
+msgstr "Add"
+
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Sequence"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Remove \"{0}\" for"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Set {0}={1} for"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "object"
+msgstr[1] "objects"
+
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Resolve {0} conflicts in {1} objects"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Change"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Object"
 msgstr "Object"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Date"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Not implemented yet."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"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
-msgid "Command Stack"
-msgstr "Command Stack"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Open a list of all commands (undo buffer)."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-msgid "Please select the objects you want to change properties for."
-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
-#, 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} objects."
-
-#: ../../../../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.)"
-msgstr ""
-"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
-msgid "Change values?"
-msgstr "Change values?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
-msgid "<different>"
-msgstr "<different>"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-msgid "Please select objects for which you want to change properties."
-msgstr "Please select objects for which you want to change properties."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "Please select a key"
-msgstr "Please select a key"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-msgid "Please select a value"
-msgstr "Please select a value"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Properties"
-msgstr "Properties"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Property for selected objects."
-msgstr "Properties for selected objects."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr "Could not read annotation preset source: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Error parsing {0}: "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Change {0} object."
-msgstr[1] "Change {0} objects."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Key"
-msgstr "Key"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Value"
-msgstr "Value"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
-msgid "Please select the row to edit."
-msgstr "Please select the row to edit."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
-msgid "Please select the row to delete."
-msgstr "Please select the row to delete."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-msgid "Add a new key/value pair to all objects"
-msgstr "Add a new key/value pair to all objects"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-#: ../../plugins/grid/src/grid/GridPlugin.java:43
-#: ../../plugins/grid/src/grid/GridPlugin.java:49
-msgid "Edit"
-msgstr "Edit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-msgid "Edit the value of the selected key for all objects"
-msgstr "Edit the value of the selected key for all objects"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-msgid "Delete the selected key in all objects"
-msgstr "Delete the selected key in all objects"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
-msgid "Delete the selected layer."
-msgstr "Delete the selected layer."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
-msgid "Show/Hide"
-msgstr "Show/Hide"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Layers"
-msgstr "Layers"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Open a list of all loaded layers."
-msgstr "Open a list of all loaded layers."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
-msgid "Move the selected layer one row up."
-msgstr "Move the selected layer one row up."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
-msgid "Move the selected layer one row down."
-msgstr "Move the selected layer one row down."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Merge the selected layer into the layer directly below."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {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 "Cannot have a writable combobox with default values (line {0})"
-
-#: ../../../../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."
-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
-msgid "element"
-msgid_plural "elements"
-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 "Unknown annotation object {0} at line {1} column {2}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Change Properties"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "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
-msgid "segment"
-msgid_plural "segments"
-msgstr[0] "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
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "way"
-msgstr[1] "ways"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
-msgid "There were conflicts during import."
-msgstr "There were conflicts during import."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} consists of:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} deleted.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#, fuzzy
+msgid "http://www.openstreetmap.org/traces"
+msgstr "URL from www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, fuzzy, java-format
+msgid "Converted from: {0}"
+msgstr "Could not read from url: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:157
 msgid "track"
 msgid_plural "tracks"
@@ -1183,5 +1457,5 @@
 msgstr[1] "tracks"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgid "point"
 msgid_plural "points"
@@ -1189,5 +1463,5 @@
 msgstr[1] "points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
 #, java-format
 msgid "a track with {0} point"
@@ -1196,5 +1470,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1203,5 +1477,5 @@
 msgstr[1] "{0} consists of {1} tracks"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} point"
@@ -1210,106 +1484,130 @@
 msgstr[1] "{0} points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:150
 msgid "Customize Color"
 msgstr "Customise Colour"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "OK"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Default"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Choose a colour"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 msgid "Import images"
 msgstr "Import images"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:253
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG images (*.jpg)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:194
+msgid "There were conflicts during import."
+msgstr "There were conflicts during import."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consists of:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} deleted.)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr "Images for {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Read GPS..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "No time for point {0} x {1}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Cannot read time \"{0}\" from point {1} x {2}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr "No images with readable timestamps found."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr "Reading {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS start: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS end: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr "current delta: {0}s"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr "timezone difference: "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1317,162 +1615,96 @@
 msgstr[1] "images"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} within the track."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Sync clock"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "The date in file \"{0}\" could not be parsed."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "There is no EXIF time within the file \"{0}\"."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Image"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr "GPS unit timezome (difference to photo)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr "Synchronise Time with GPS Unit"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr "Time entered could not be parsed."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
-msgid "Could not read bookmarks."
-msgstr "Could not read bookmarks."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
-msgid "Could not write bookmark."
-msgstr "Could not write bookmark."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Java Open Street Map - Editor"
-msgstr "Java Open Street Map - Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
-msgid "layer not in list."
-msgstr "layer not in list."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
-msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hint: Some changes came from uploading new data to the server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
-msgid "There are unsaved changes. Really quit?"
-msgstr "There are unsaved changes. Really quit?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
-msgid "Unsaved Changes"
-msgstr "Unsaved Changes"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "usage"
-msgstr "usage"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "options"
-msgstr "options"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-msgid "Show this help"
-msgstr "Show this help"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-msgid "Standard unix geometry argument"
-msgstr "Standard unix geometry argument"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-msgid "Download the bounding box"
-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 "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 "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 "Download the bounding box as raw gps"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-msgid "Select with the given search"
-msgstr "Select with the given search"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-msgid "Don't launch in fullscreen mode"
-msgstr "Don't launch in fullscreen mode"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-msgid "Reset the preferences to default"
-msgstr "Reset the preferences to default"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
-msgid "Set the language. Example: "
-msgstr "Set the language. Example: "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
-msgid "examples"
-msgstr "examples"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"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 "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr "Layer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr "Files"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr "Connection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:128
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:146
+#, fuzzy, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} consists of {1} track"
+msgstr[1] "{0} consists of {1} tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:86
+msgid "There was an error while trying to play the sound file for this marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:88
+#, fuzzy
+msgid "Error playing sound"
+msgstr "Error parsing {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:42
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "(URL was: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#, fuzzy
+msgid "Error displaying URL"
+msgstr "Error parsing {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
 msgid "Contacting the OSM server..."
 msgstr "Contacting the OSM server..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Lat/Lon"
-msgstr "Lat/Lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Key"
+msgstr "Key"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Value"
+msgstr "Value"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1481,169 +1713,155 @@
 msgstr[1] "{0} objects have conflicts:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
 msgid "my version:"
 msgstr "my version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
 msgid "their version:"
 msgstr "their version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
 msgid "resolved version:"
 msgstr "resolved version:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
-msgid "Error while parsing"
-msgstr "Error while parsing"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
-msgid "File Not found"
-msgstr "File Not found"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "string"
-msgstr "string"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-msgid "Name of the user."
-msgstr "Name of the user."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-msgid "OSM Password."
-msgstr "OSM Password."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "string;string;..."
-msgstr "string;string;..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
-msgstr ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "any"
-msgstr "any"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "If specified, reset the configuration instead of reading it."
-msgstr "If specified, reset the configuration instead of reading it."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
-msgid "Username"
-msgstr "Username"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
-msgid "Password"
-msgstr "Password"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
-msgid "You have to restart JOSM for some settings to take effect."
-msgstr "You have to restart JOSM for some settings to take effect."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
-msgid "Draw lines between raw gps points."
-msgstr "Draw lines between raw gps points."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
-msgid "Force lines if no segments imported."
-msgstr "Force lines if no segments imported."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
-msgid "Draw large GPS points."
-msgstr "Draw large GPS points."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
-msgid "Draw Direction Arrows"
-msgstr "Draw Direction Arrows"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
-msgstr ""
-"Force drawing of lines if the imported data contain no line information."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
-msgid "Draw larger dots for the GPS points."
-msgstr "Draw larger dots for the GPS points."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
-msgid "Draw direction hints for all segments."
-msgstr "Draw direction hints for all segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
-msgid "Color"
-msgstr "Colour"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
-msgid "Name"
-msgstr "Name"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
-msgid "Choose"
-msgstr "Choose"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
-msgid "Please select a color."
-msgstr "Please select a colour."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
-#, java-format
-msgid "Choose a color for {0}"
-msgstr "Choose a colour for {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
-msgid "Annotation preset source"
-msgstr "Annotation preset source"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
-msgid "The base URL to the OSM server (REST API)"
-msgstr "The base URL to the OSM server (REST API)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
-msgid "Login name (email) to the OSM account."
-msgstr "Login name (email) to the OSM account."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Login password to the OSM account. Leave blank to not store any password."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
-msgid "The base URL to the server retrieving WMS background pictures from."
-msgstr "The base URL to the server retrieving WMS background pictures from."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+msgid "Layer"
+msgstr "Layer"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+msgid "Edit"
+msgstr "Edit"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
+#: ../osmarender/src/OsmarenderPlugin.java:98
+#: ../osmarender/src/OsmarenderPlugin.java:104
+msgid "View"
+msgstr "View"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
+msgid "Files"
+msgstr "Files"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
+msgid "Connection"
+msgstr "Connection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
+msgid "Tools"
+msgstr "Tools"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
+#, fuzzy
+msgid "Zoom To"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:28
+msgid "Projection method"
+msgstr "Projection method"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#, fuzzy
+msgid "Configure available plugins."
+msgstr "Configure available Plugins."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+msgid "Get more plugins"
+msgstr "Get more plugins"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#, java-format
+msgid "Downloaded plugin information from {0} site"
+msgid_plural "Downloaded plugin information from {0} sites"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#, fuzzy
+msgid "No plugin information found."
+msgstr "Plugin not found: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#, fuzzy
+msgid "Update current"
+msgstr "Save the current data."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+msgid "Not implemented yet."
+msgstr "Not implemented yet."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#, fuzzy
+msgid "Configure Plugin Sites"
+msgstr "Configure available Plugins."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:116
+msgid "Plugin bundled with JOSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:160
+#, java-format
+msgid "Error reading plugin information file: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:186
+#, fuzzy, java-format
+msgid ""
+"Download the following plugins?\n"
+"\n"
+"{0}"
+msgstr "Download the following data:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#, fuzzy
+msgid "Download missing plugins"
+msgstr "Downloading data"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+#, fuzzy
+msgid "Advanced Preferences"
+msgstr "Preferences"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:64
+#, fuzzy
+msgid "Enter a new key/value pair"
+msgstr "Add a new key/value pair to all objects"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
+msgstr "Please select the row to edit."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Images for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Look and Feel"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1661,73 +1879,197 @@
 "example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
-msgid ""
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr "CSV import specification (empty: read from first line in data)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Draw lines between raw gps points."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+msgid "Force lines if no segments imported."
+msgstr "Force lines if no segments imported."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+msgid "Draw large GPS points."
+msgstr "Draw large GPS points."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+msgid "Draw Direction Arrows"
+msgstr "Draw Direction Arrows"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+#, fuzzy
+msgid ""
+"If your gps device draw too few lines, select this to draw lines along your "
+"way."
+msgstr ""
 "If your gps device draw to few lines, select this to draw lines along your "
 "way."
-msgstr ""
-"If your gps device draw to few lines, select this to draw lines along your "
-"way."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Force drawing of lines if the imported data contain no line information."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Draw larger dots for the GPS points."
+msgstr "Draw larger dots for the GPS points."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Draw direction hints for all segments."
+msgstr "Draw direction hints for all segments."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+msgid "Draw the order numbers of all segments within their way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#, fuzzy
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Download map data from the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgid "Draw the inactive data layers in a different color."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid "Display Settings"
+msgstr "Display Settings"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Various settings that influence the visual representation of the whole "
+"program."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#, fuzzy
+msgid "Connection Settings for the OSM server."
+msgstr "Connection Settings to the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Map Settings"
+msgstr "Map Settings"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Settings for the map projection and data interpretation."
+msgstr "Settings for the map projection and data interpretation."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:78
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "You have to restart JOSM for some settings to take effect."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:53
+#, fuzzy
+msgid "Tagging preset source"
+msgstr "Annotation preset source"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#, fuzzy
+msgid ""
+"The sources (url or filename) of tagging preset definition files. See http://"
+"josm.eigenheimstrasse.de/wiki/TaggingPresets for help."
+msgstr ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#, fuzzy
+msgid "Add a new tagging preset source to the list."
+msgstr "Add a new annotation preset source to the list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
+msgid "Delete the selected source from the list."
+msgstr "Delete the selected source from the list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#, fuzzy
+msgid "Tagging preset sources"
+msgstr "Annotation preset sources"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:48
+msgid "Color"
+msgstr "Colour"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:49
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Name"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
+msgid "Choose"
+msgstr "Choose"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:122
+msgid "Please select a color."
+msgstr "Please select a colour."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:127
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choose a colour for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:132
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
-msgid ""
-"The sources (url or filename) of annotation preset definition files. See "
-"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 "Add a new annotation preset source to the list."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
-msgid "Delete the selected source from the list."
-msgstr "Delete the selected source from the list."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid "Display Settings"
-msgstr "Display Settings"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr ""
-"Various settings that influence the visual representation of the whole "
-"program."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
-msgid "Look and Feel"
-msgstr "Look and Feel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
 msgid "Colors"
 msgstr "Colours"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings"
-msgstr "Connection Settings"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings to the OSM server."
-msgstr "Connection Settings to the OSM server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
+#, fuzzy
+msgid "The base URL for the OSM server (REST API)"
+msgstr "The base URL to the OSM server (REST API)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgid "Login name (email) to the OSM account."
+msgstr "Login name (email) to the OSM account."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Login password to the OSM account. Leave blank to not store any password."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
 msgid "OSM username (email)"
 msgstr "OSM username (email)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "OSM password"
 msgstr "OSM password"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1739,352 +2081,1337 @@
 "url.<br><b>Do not use a valuable Password.</b></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
-msgid "CSV import specification (empty: read from first line in data)"
-msgstr "CSV import specification (empty: read from first line in data)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Map Settings"
-msgstr "Map Settings"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Settings for the map projection and data interpretation."
-msgstr "Settings for the map projection and data interpretation."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
-msgid "Projection method"
-msgstr "Projection method"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
-msgid "Annotation preset sources"
-msgstr "Annotation preset sources"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Configure available Plugins."
-msgstr "Configure available Plugins."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
-msgid "Get more plugins"
-msgstr "Get more plugins"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Downloading points {0} to {1}..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Downloading OSM data..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
-msgid "Unknown version"
-msgstr "Unknown version"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
-msgid "Found <seg> tag on non-way."
-msgstr "Found <seg> tag on non-way."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
-msgid "Incomplete segment with id=0"
-msgstr "Incomplete segment with id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
+msgid "Could not read bookmarks."
+msgstr "Could not read bookmarks."
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
+msgid "Could not write bookmark."
+msgstr "Could not write bookmark."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:109
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#, fuzzy
+msgid "Java OpenStreetMap - Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:147
+msgid "layer not in list."
+msgstr "layer not in list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+msgid "Getting Started"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
+#, fuzzy
+msgid "[Download] some data from the OSM server"
+msgstr "Download map data from the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
+msgid "Getting Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:68
+msgid "Open the [online help] (english only)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+msgid "Watch some [tutorial videos]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Join the newbie [mailing list]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:191
+#, fuzzy
+msgid "Unknown type"
+msgstr "Unknown host"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:241
+#, fuzzy, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "Could not read annotation preset source: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:244
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Error parsing {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:277
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Change {0} object."
+msgstr[1] "Change {0} objects."
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:307
+msgid "Change Properties"
+msgstr "Change Properties"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload Preferences"
+msgstr "Preferences"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload the current preferences to the server"
+msgstr "Upload all changes to the OSM server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+msgid "string"
+msgstr "string"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+msgid "Name of the user."
+msgstr "Name of the user."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+msgid "OSM Password."
+msgstr "OSM Password."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+#, fuzzy
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid "string;string;..."
+msgstr "string;string;..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+msgstr ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "any"
+msgstr "any"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "If specified, reset the configuration instead of reading it."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Click Reload to refresh list"
+msgstr "Click Reload to refresh list"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+msgid "Reload"
+msgstr "Reload"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Revert"
+msgstr "Revert"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "History"
+msgstr "History"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "Display the history of all selected items."
+msgstr "Display the history of all selected items."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
+msgid "Date"
+msgstr "Date"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reload all currently selected objects and refresh the list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:142
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+msgid "Delete the selected layer."
+msgstr "Delete the selected layer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:70
+msgid "Do you really want to delete the whole layer?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+msgid "Show/Hide"
+msgstr "Show/Hide"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#, fuzzy
+msgid "Show/Hide Text"
+msgstr "Show/Hide"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#, fuzzy
+msgid "Toggle visible state of the marker text."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Layers"
+msgstr "Layers"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Open a list of all loaded layers."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:221
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:227
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:241
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Merge the selected layer into the layer directly below."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Merging conflicts."
+msgstr "Merging conflicts."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Resolve"
+msgstr "Resolve"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Open a merge dialog of all selected items in the list above."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid "Select"
+msgstr "Select"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Set the selected elements on the map to the selected items in the list above."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:109
+msgid "Please select something from the conflict list."
+msgstr "Please select something from the conflict list."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "Resolve Conflicts"
+msgstr "Resolve Conflicts"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Authors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Open a list of people working on the selected objects."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+msgid "Author"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+#, fuzzy
+msgid "# Objects"
+msgstr "Object"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
+msgid "Please select the objects you want to change properties for."
+msgstr "Please select the objects you want to change properties for."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#, 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} objects."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+msgid "An empty value deletes the key."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+msgid "Change values?"
+msgstr "Change values?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:394
+msgid "<different>"
+msgstr "<different>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:160
+#, fuzzy, java-format
+msgid "Change properties of {0} object"
+msgid_plural "Change properties of {0} objects"
+msgstr[0] "Change {0} object."
+msgstr[1] "Change {0} objects."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+msgid "Please select objects for which you want to change properties."
+msgstr "Please select objects for which you want to change properties."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+msgid "Please select a key"
+msgstr "Please select a key"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+msgid "Please select a value"
+msgstr "Please select a value"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+msgid "Properties"
+msgstr "Properties"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+#, fuzzy
+msgid "Properties for selected objects."
+msgstr "Properties for selected objects."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+msgid "Add a new key/value pair to all objects"
+msgstr "Add a new key/value pair to all objects"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+msgid "Edit the value of the selected key for all objects"
+msgstr "Edit the value of the selected key for all objects"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+msgid "Delete the selected key in all objects"
+msgstr "Delete the selected key in all objects"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Command Stack"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Open a list of all commands (undo buffer)."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Current Selection"
+msgstr "Current Selection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Open a selection list window."
+msgstr "Open a selection list window."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
+msgid "Error while parsing"
+msgstr "Error while parsing"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+#, fuzzy
+msgid "File not found"
+msgstr "File Not found"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:49
+msgid "You can paste an URL here to download the area."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lat"
+msgstr "min lat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "min lon"
+msgstr "min lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lat"
+msgstr "max lat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+msgid "max lon"
+msgstr "max lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "URL from www.openstreetmap.org"
+msgstr "URL from www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:166
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:169
+msgid "Download area ok, size probably acceptable to server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:99
+msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:64
+msgid "Please enter the desired coordinates first."
+msgstr "Please enter the desired coordinates first."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
+msgid "Please enter a name for the location."
+msgstr "Please enter a name for the location."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+msgid "Remove"
+msgstr "Remove"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Select a bookmark first."
+msgstr "Select a bookmark first."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:74
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:106
+#, fuzzy
+msgid "Download Area"
+msgstr "Download?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgid "usage"
+msgstr "usage"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+msgid "options"
+msgstr "options"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+msgid "Show this help"
+msgstr "Show this help"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid "Standard unix geometry argument"
+msgstr "Standard unix geometry argument"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgid "Download the bounding box"
+msgstr "Download the bounding box"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Open file (as raw gps, if .gpx or .csv)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid "Download the bounding box as raw gps"
+msgstr "Download the bounding box as raw gps"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgid "Select with the given search"
+msgstr "Select with the given search"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Don't launch in fullscreen mode"
+msgstr "Don't launch in fullscreen mode"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "Reset the preferences to default"
+msgstr "Reset the preferences to default"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
+msgid "Set the language. Example: "
+msgstr "Set the language. Example: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "examples"
+msgstr "examples"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:92
+#, java-format
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:95
+#, fuzzy, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr "Could not load plugin {0}."
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "An error occoured in plugin {0}"
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:193
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Latitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:195
+#: ../livegps/livegps/LiveGpsDialog.java:57
+msgid "Longitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:200
+#, fuzzy
+msgid "Grid layout"
+msgstr "layer"
+
+#: ../grid/src/grid/GridLayer.java:222
+#, fuzzy
+msgid "Grid layer:"
+msgstr "layer"
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:34
+#, java-format
+msgid ""
+"Do you want to load a basic tagging preset for your language ({0})?\n"
+"This is recommend for beginners of JOSM.\n"
+"\n"
+"'Cancel' will ask this question on next start again."
+msgstr ""
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:35
+msgid "Language Plugin detected"
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:86
+msgid "FireFox not found. Please set firefox executable in the preferences."
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:135
+#, fuzzy
+msgid "osmarender options"
+msgstr "Export options"
+
+#: ../osmarender/src/OsmarenderPlugin.java:136
+msgid "FireFox executable"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+#, fuzzy
+msgid "Version"
+msgstr "Revision"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
+#, fuzzy
+msgid "Update"
+msgstr "data"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+#, fuzzy
+msgid "Add Site"
+msgstr "Add node"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
+msgid "Update Site Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+msgid "Invalid Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+#, fuzzy
+msgid "Delete Site(s)"
+msgstr "Delete Node"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+#, fuzzy
+msgid "Please select the site to delete."
+msgstr "Please select the row to delete."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
+#, fuzzy
+msgid "Please select the site(s) to check for updates."
+msgstr "Please select at least four nodes."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+#, fuzzy
+msgid "Delete the selected site(s) from the list."
+msgstr "Delete the selected source from the list."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
+msgid "Update Sites"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
+#, fuzzy, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr "Error parsing {0}: "
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+msgid "No validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+#, fuzzy
+msgid "Open the validation window."
+msgstr "Open a selection list window."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+msgid ""
+"A OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "last change at {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:35
+#, fuzzy
+msgid "Single node segments."
+msgstr "Add node into segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:36
+msgid ""
+"This test checks that there are no segments with the same node as start and "
+"destination."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:44
+#, fuzzy
+msgid "Single node segments"
+msgstr "Add node into segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+#, fuzzy
+msgid "Untagged nodes."
+msgstr "Unsaved Changes"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+msgid "This test checks for untagged nodes that are not part of any segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:97
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:30
+msgid "Crossing roads."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:31
+msgid ""
+"This test checks if two roads,railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:83
+msgid "Crossing roads"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:26
+#, fuzzy
+msgid "Reused segments."
+msgstr "Reverse Segments"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:27
+msgid "This test checks if a segment is used in more than one way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:45
+#, fuzzy
+msgid "Reused segments"
+msgstr "Reverse Segments"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
+#, fuzzy
+msgid "Tagged segments"
+msgstr "segments"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:30
+msgid "This test checks that no segment is tagged. Only ways should be tagged."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:45
+msgid "Segments with tags"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:29
+msgid "Similar named ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:30
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:75
+msgid "Similar named ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Remove \"{0}\" for"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:29
+msgid "Duplicated segments."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:30
+msgid "This test checks that two nodes are not used by more than one segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:48
+#, fuzzy
+msgid "Duplicated segments"
+msgstr "Add segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:22
+msgid "Unordered ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:23
+msgid "This test checks that all segments in a way are properly ordered."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:34
+msgid "Unordered ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:111
+#, fuzzy
+msgid "Properties checker."
+msgstr "Properties"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:112
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:178
+#, fuzzy, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr "Could not rename the file \"{0}\"."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:241
+msgid "Tags with empty values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:246
+msgid "Invalid property keys"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:254
+msgid "Unknown property values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:262
+msgid "FIXMES"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:370
+#, fuzzy
+msgid "Check property keys."
+msgstr "Change Properties"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:371
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:403
+msgid "Spellcheck source"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:423
+#, fuzzy
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+msgstr ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+#, fuzzy
+msgid "Add a new spellcheck source to the list."
+msgstr "Add a new annotation preset source to the list."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:425
+#, fuzzy
+msgid "Edit the selected source."
+msgstr "Delete the selected layer."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:428
+msgid "Spellcheck data sources"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:450
+#, fuzzy
+msgid "Check property values."
+msgstr "Change Properties"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:451
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:459
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:460
+msgid "Looks for nodes, segments or ways with FIXME in any property value."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:28
+#, fuzzy
+msgid "Orphaned segments."
+msgstr "Add segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:29
+msgid "This test checks that every segment is in a way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:44
+#, fuzzy
+msgid "Segments not in a way"
+msgstr "Add segments to way?"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:37
+#, fuzzy
+msgid "Untagged ways."
+msgstr "Geotagged Images"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:38
+msgid "This test checks for untagged ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:66
+#, fuzzy
+msgid "Unnamed ways"
+msgstr "unnamed"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
+#, fuzzy
+msgid "Untagged ways"
+msgstr "Geotagged Images"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+msgid "Duplicated nodes."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:109
+#, fuzzy
+msgid "Nodes have conflicting key: "
+msgstr "Conflicting keys"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
+#, fuzzy
+msgid "Merge Nodes"
+msgstr "Delete Node"
+
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
+msgid "WMS"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr "Wrong longitude transformation for tile manager. Can't operate on {0}"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+#, fuzzy
+msgid "WMS Plugin Preferences"
+msgstr "Preferences"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:24
+#, fuzzy
+msgid "Downloading "
+msgstr "Downloading data"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
+msgid ""
+"<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
+"<b>must</b> be configured with the javascript 'dump' method,<br>that can be "
+"activated with the property 'browser.dom.window.dump.enabled=true' in the "
+"about:config page.</html>"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
+msgid ""
+"<html>The port that the server will use to listen WMS requests<br>The WMS "
+"plugin need to be configured to use this port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
+msgid ""
+"<html>Name of the profile.<br>This profile is used to avoid nag firefox "
+"screens asking you to resume failed sessions.<br>Just set the selected "
+"profile as not default in the profile selection window and configure to not "
+"ask<br>about failed sessions with 'browser.sessionstore."
+"resume_from_crash=false' in the about:config page"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Yahoo! WMS server"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Settings for the Yahoo! imagery server."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
+#, fuzzy
+msgid "YWMS options"
+msgstr "options"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
+msgid "Firefox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
+msgid "Firefox profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
+#, fuzzy
+msgid "Create"
+msgstr "Create new way"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
+msgid "Server port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
+#, fuzzy
+msgid "Please name the profile you want to create."
+msgstr "Please select the objects you want to change properties for."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
+msgid "Creating profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
+msgid "You have to select some segments that don't belong to any way."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy, java-format
+msgid "Create {0} way from {1} segments?"
+msgid_plural "Create {0} ways from {1} segments?"
+msgstr[0] "Create a new way out of {0} segment?"
+msgstr[1] "Create a new way out of {0} segments?"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy
+msgid "Create ways"
+msgstr "Create new way"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:82
+#, fuzzy
+msgid "Create linear ways"
+msgstr "Create new way"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "way"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, fuzzy, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Could not read from url: \"{0}\""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:56
+msgid "start"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:58
+msgid "end"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:43
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:53
+msgid "Center Once"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:64
+msgid "Auto-Center on current position"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:95
+#: ../livegps/livegps/LiveGpsAcquirer.java:110
+#, fuzzy
+msgid "Connecting"
+msgstr "Connection"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:169
+#, fuzzy
+msgid "Connected"
+msgstr "Connection"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:181
+#: ../livegps/livegps/LiveGpsAcquirer.java:196
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:190
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Connection"
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Raw GPS data"
+
+#: ../livegps/livegps/LiveGpsDialog.java:51
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#, fuzzy
+msgid "Way Info"
+msgstr "Info"
+
+#: ../livegps/livegps/LiveGpsDialog.java:59
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:61
+#, fuzzy
+msgid "Course"
+msgstr "Choose"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid "Tagging Preset Tester"
+msgstr "Annotation Preset Tester"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+"Open the annotation preset test tool for previewing annotation preset "
+"dialogs."
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+#, fuzzy
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr "You have to specify annotation sources in the preferences first."
+
+#: ../namefinder/namefinder/PlaceSelection.java:39
+#, fuzzy
+msgid "Search..."
+msgstr "Search"
+
+#: ../namefinder/namefinder/PlaceSelection.java:101
 msgid "NullPointerException. Possible some missing tags."
 msgstr "NullPointerException. Possible some missing tags."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
-msgid "Illegal object with id=0"
-msgstr "Illegal object with id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr "Couldn't read time format \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr "Missing required attribute \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
-msgid "Preparing data..."
-msgstr "Preparing data..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
-msgid "Illformed Node id"
-msgstr "Ill-formed Node id"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
-#, java-format
-msgid "Upload {0} {1} ({2})..."
-msgstr "Upload {0} {1} ({2})..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
-msgid "Unknown host"
-msgstr "Unknown host"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
-#: ../../plugins/waypoints/src/WaypointReader.java:55
+#: ../namefinder/namefinder/PlaceSelection.java:150
+msgid "Cannot read place search results from server"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:159
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:166
+msgid "Places"
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:55
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr "Data error: lat value \"{0}\" is out of bound."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
-#: ../../plugins/waypoints/src/WaypointReader.java:59
+#: ../waypoints/src/WaypointReader.java:59
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Data error: lon value \"{0}\" is out of bound."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
-msgid "Could not detect data format string."
-msgstr "Could not detect data format string."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
-msgid ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-msgstr ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-#, java-format
-msgid "Unknown data type: \"{0}\"."
-msgstr "Unknown data type: \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-msgid "Maybe add an format string in preferences."
-msgstr "Maybe add an format string in preferences."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr "Parsing error in line {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
-msgid "Incorrect password or username."
-msgstr "Incorrect password or username."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Warning: The password is transferred unencrypted."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Save user and password (unencrypted)"
-msgstr "Save user and password (unencrypted)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
-msgid "Aborting..."
-msgstr "Aborting..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-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 "Data error: Node {0} is deleted but part of Segment {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr "Error during parse."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr "position"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr "different"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr "deleted"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr "true"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr "false"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr "none"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr "segments"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
-msgid "to"
-msgstr "to"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
-msgid "from"
-msgstr "from"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "new"
-msgstr "new"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "unknown"
-msgstr "unknown"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} node"
-msgstr[1] "{0} nodes"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
-msgid "incomplete"
-msgstr "incomplete"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-msgid "background"
-msgstr "background"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
-msgid "incomplete way"
-msgstr "incomplete way"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
-msgid "selected"
-msgstr "selected"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
-msgid "gps point"
-msgstr "gps point"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
-msgid "scale"
-msgstr "scale"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Resolve {0} conflicts in {1} objects"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr "Change"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
-msgid "Sequence"
-msgstr "Sequence"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr "Remove \"{0}\" for"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr "Set {0}={1} for"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "object"
-msgstr[1] "objects"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
-#, java-format
-msgid "Plugin not found: {0}."
-msgstr "Plugin not found: {0}."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, java-format
-msgid "Could not load plugin {0}."
-msgstr "Could not load plugin {0}."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
-msgid "unnamed"
-msgstr "unnamed"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271
-msgid "The projection could not be read from preferences. Using EPSG:4263."
-msgstr "The projection could not be read from preferences. Using EPSG:4263."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignoring malformed url: \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignoring malformed file url: \"{0}\""
-
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:102
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:108
-msgid "View"
-msgstr "View"
-
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:18
-msgid "Landsat background images"
-msgstr "Landsat background images"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr "Wrong longitude transformation for tile manager. Can't operate on {0}"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:70
-#, java-format
-msgid "WMS layer: {0}"
-msgstr "WMS layer: {0}"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr "Annotation Preset Tester"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr "You have to specify annotation sources in the preferences first."
-
-#: ../../plugins/grid/src/grid/GridLayer.java:74
-#, fuzzy
-msgid "Grid layer:"
-msgstr "layer"
-
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open waypoints file"
 msgstr "Open a file."
 
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open a waypoints file."
 msgstr "Open a file."
 
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#, fuzzy
+msgid "Please select a scheme to use."
+msgstr "Please select the row to edit."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
+#, fuzzy
+msgid "Please select the scheme to delete."
+msgstr "Please select the row to delete."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
+#, fuzzy
+msgid "Use the selected scheme from the list."
+msgstr "Delete the selected source from the list."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#, fuzzy
+msgid "Use the current colors as a new color scheme."
+msgstr "Save the current data to a new file."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#, fuzzy
+msgid "Delete the selected scheme from the list."
+msgstr "Delete the selected source from the list."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#, fuzzy
+msgid "Color Schemes"
+msgstr "Colours"
+
+#~ msgid "Add Node into Segment"
+#~ msgstr "Add Node into Segment"
+
+#~ msgid "Executing {0}"
+#~ msgstr "Executing {0}"
+
+#~ msgid "The Tool requires some data to be loaded."
+#~ msgstr "The Tool requires some data to be loaded."
+
+#~ msgid "Could not execute command: {0}"
+#~ msgstr "Could not execute command: {0}"
+
+#~ msgid "Could not read external tool configuration."
+#~ msgstr "Could not read external tool configuration."
+
+#~ msgid ""
+#~ "Move and zoom the image like the main map. Select an area to download by "
+#~ "dragging."
+#~ msgstr ""
+#~ "Move and zoom the image like the main map. Select an area to download by "
+#~ "dragging."
+
+#~ msgid "Bounding box"
+#~ msgstr "Bounding box"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Bookmarks"
+
+#~ msgid "Choose an area"
+#~ msgstr "Choose an area"
+
+#~ msgid "Please enter the desired coordinates or click on a bookmark."
+#~ msgstr "Please enter the desired coordinates or click on a bookmark."
+
+#~ msgid "Auto Scale: {0}"
+#~ msgstr "Auto Scale: {0}"
+
+#~ msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+#~ msgstr "Auto zoom the view (to {0}. Disabled if the view is moved)"
+
+#~ msgid "Downloading {0} segment"
+#~ msgid_plural "Downloading {0} segments"
+#~ msgstr[0] "Downloading {0} segment"
+#~ msgstr[1] "Downloading {0} segments"
+
+#~ msgid ""
+#~ "The plugin {0} throwed an exception: {1}\n"
+#~ "It may be outdated. Please contact the plugin's autor.\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Please send this to josm@eigenheimstrasse.de\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Please send this to josm@eigenheimstrasse.de\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+#~ msgstr ""
+#~ "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+
+#~ msgid "Unknown type at line {0}"
+#~ msgstr "Unknown type at line {0}"
+
+#~ msgid "Cannot have a writable combobox with default values (line {0})"
+#~ msgstr "Cannot have a writable combobox with default values (line {0})"
+
+#~ msgid ""
+#~ "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."
+
+#~ msgid "element"
+#~ msgid_plural "elements"
+#~ msgstr[0] "element"
+#~ msgstr[1] "elements"
+
+#~ msgid "Unknown annotation object {0} at line {1} column {2}"
+#~ msgstr "Unknown annotation object {0} at line {1} column {2}"
+
+#~ msgid "The base URL to the server retrieving WMS background pictures from."
+#~ msgstr "The base URL to the server retrieving WMS background pictures from."
+
+#~ msgid "Landsat background images"
+#~ msgstr "Landsat background images"
+
+#~ msgid "WMS layer: {0}"
+#~ msgstr "WMS layer: {0}"
+
 #~ msgid "Download {0} ways containing a total of {1} segments?"
 #~ msgstr "Download {0} ways containing a total of {1} segments?"
@@ -2093,12 +3420,6 @@
 #~ msgstr "Refresh the selection list."
 
-#~ msgid "Search for objects."
-#~ msgstr "Search for objects."
-
 #~ msgid "Conflicts in disjunct objects"
 #~ msgstr "Conflicts in disjunct objects"
-
-#~ msgid "Downloading {0} {1}"
-#~ msgstr "Downloading {0} {1}"
 
 #~ msgid "Got more than one object when expecting only one."
@@ -2202,7 +3523,4 @@
 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Cannot open preferences directory: {0}"
-
 #~ msgid ""
 #~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
Index: /applications/editors/josm/plugins/lang/fr/fr.po
===================================================================
--- /applications/editors/josm/plugins/lang/fr/fr.po	(revision 3651)
+++ /applications/editors/josm/plugins/lang/fr/fr.po	(revision 3652)
@@ -7,5 +7,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-22 21:32+0200\n"
+"POT-Creation-Date: 2007-07-21 14:05+0200\n"
 "PO-Revision-Date: 2006-10-14 12:17+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -16,114 +16,476 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
-msgid "Add segment"
-msgstr "Ajouter un segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
-msgid "Add a segment between two nodes."
-msgstr "Ajouter un segment entre deux noeuds."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr "Supprimer des noeuds, des rues ou des segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr "Impossible de supprimer le noeud."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr "Cet objet est en utilisation."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr "Utilisé par plus de deux segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr "Utilisé par un seul segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr "Segments dans la mauvaise direction."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr "Clés conflictuelles"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr "Les segments appartiennent à différents chemins."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr "Supprimer un noeud"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-msgstr ""
-"Zoomer en sélectionnant une zone à la souris. (Ctrl+haut, gauche, bas, "
-"droite, +, -)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "à"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "depuis"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "rien"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "segments"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "position"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "différent"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "supprimé"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "vrai"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "faux"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:183
+msgid "background"
+msgstr "arrière plan"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:184
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:70
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "noeud"
+msgstr[1] "noeuds"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "segment"
+msgstr[1] "segments"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "chemin"
+msgstr[1] "chemins"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+msgid "incomplete way"
+msgstr "chemin incomplet"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+msgid "selected"
+msgstr "sélectionné"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+msgid "gps point"
+msgstr "point GPS"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "conflict"
+msgstr "conflit"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+msgid "scale"
+msgstr "mesure"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#, fuzzy, java-format
+msgid "Preferences stored on {0}"
+msgstr "Préférences"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
+#, fuzzy, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+"Impossible d'ouvrir le rÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©pertoire des "
+"prÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©fÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©rences : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+msgid "new"
+msgstr "nouveau"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:106
+msgid "unknown"
+msgstr "inconnu"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:91
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} noeud"
+msgstr[1] "{0} noeuds"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:94
+msgid "incomplete"
+msgstr "incomplet"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:227
+#, java-format
+msgid "Plugin not found: {0}."
+msgstr "Greffon non trouvé : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:255
+#, java-format
+msgid "Could not load plugin {0}."
+msgstr "Impossible de charger le greffon \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:316
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr ""
+"La projection ne peut être lue depuis les préférences. EPSG:4263 sera "
+"utilisé."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:386
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Indication : Certains changements viennent du chargment de nouvelles données "
+"sur le serveur."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:388
+#, fuzzy
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr "Certains changements ne sont pas sauvegardés. Quitter quand même ?"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:389
+msgid "Unsaved Changes"
+msgstr "Changements non sauvegardés"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:401
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignore l'URL malformé : \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignore le fichier malformé d'URL : \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload to OSM"
+msgstr "Charger sur OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload all changes to the OSM server."
+msgstr "Charger tous les changements sur le serveur OSM."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Objects to add:"
+msgstr "Objets à ajouter : "
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+msgid "Objects to modify:"
+msgstr "Objets à modifier : "
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+msgid "Objects to delete:"
+msgstr "Objets à supprimer : "
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
+#, fuzzy
+msgid "Upload these changes?"
+msgstr "Charger ces changements ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Nothing to upload. Get some data first."
+msgstr "Rien à charger. Obtenez d'abord des données."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr ""
+"Certains conflits ne sont pas résolus. Vous devez d'abord les résoudre."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
+msgid "No changes to upload."
+msgstr "Aucun changement à charger."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
+msgid "Uploading data"
+msgstr "Chargement des données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
+msgid "Rename layer"
+msgstr "Renommer le calque"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Renommer également le fichier."
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Impossible de renommer le fichier \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect All"
+msgstr "sélectionné"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect all objects."
+msgstr "Supprimer la clé sélectionnée de tous les objets"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
+#, fuzzy
+msgid "Align Nodes in Line"
+msgstr "Placer les noeuds en cercle"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#, fuzzy
+msgid "Move the selected nodes onto a line."
+msgstr "Déplacer les noeuds sélectionnés en un cercle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
+#, fuzzy
+msgid "Please select at least three nodes."
+msgstr "Sélectionner au moins quatre noeuds."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fichiers d'un serveur OSM (.osm .xml)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#, fuzzy
+msgid "GPX Files (.gpx .gpx.gz)"
+msgstr "Fichiers GPX (.gpx)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fichiers CSV (.csv .txt)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr "Placer les noeuds en cercle"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr "Déplacer les noeuds sélectionnés en un cercle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
+msgstr "Sélectionner au moins quatre noeuds."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save the current data."
+msgstr "Sauvegarder les données actuelles"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
+msgid "data"
+msgstr "données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
+msgid "selection"
+msgstr "sélection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
+msgid "layer"
+msgstr "calque"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom to {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "New"
+msgstr "nouveau"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "Create a new map."
+msgstr "Créer un nouveau chemin"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr "sans-nom"
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine several ways into one."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#, fuzzy
+msgid "Please select at least two ways to combine."
+msgstr "Sélectionner au moins un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:91
+msgid "Enter values for all conflicts."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:100
+#, java-format
+msgid "Combine {0} ways"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+msgid "Help"
+msgstr "Aide"
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr ""
+"Les pages d'aide ne peuvent être éditées que depuis l'aide en ligne de JOSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+msgid "Open a preferences page for global settings."
+msgstr "Ouvrir la page des préférences pour les réglages généraux."
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refaire"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refaire la dernière action annulée"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save as"
+msgstr "Sauvegarder sous"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save the current data to a new file."
+msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+#, fuzzy
+msgid "Reorder Segments"
+msgstr "Retourne les segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+msgid ""
+"Try to reorder segments of a way so that they are in a line. May try to flip "
+"segments around to match a line."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:41
+#, fuzzy
+msgid "Please select at least one way."
+msgstr "Sélectionner au moins un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
+#, fuzzy
+msgid "Reorder segments"
+msgstr "Réorganiser tous les segments de la ligne ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
+#, fuzzy
+msgid "The selected way is incomplete or has only one segment."
+msgid_plural ""
+"None of the selected ways are complete and have more than one segment."
+msgstr[0] "Sélectionner au moins un segment."
+msgstr[1] "Sélectionner au moins un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
+#, fuzzy, java-format
+msgid "Reorder segments for way {0}"
+msgstr "Ajouter des segments aux chemins"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add node"
+msgstr "Ajouter un noeud"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add a new node to the map"
+msgstr "Ajouter un nouveau noeud à la carte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:142
+msgid "Add node into segment"
+msgstr "Ajouter un noeud dans un segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+msgid "Add a node into an existing segment"
+msgstr "Ajouter un noeud dans un segment existant"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:167
+#, fuzzy
+msgid "Add node and connect"
+msgstr "Ajouter un noeud dans un segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+msgid "Add a node and connect it to the selected (previously added) node"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
+msgid "Can not add a node outside of the world."
+msgstr "Impossible d'ajouter un noeud en dehors de la Terre."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Sélection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects by dragging or clicking."
 msgstr ""
 "Sélectionner des objets en cliquant ou en définissant une zone à la souris."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Ligne droite"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Select objects in a straight line."
 msgstr "Sélectionner des objets sur une ligne droite."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Déplacer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr "Déplacer les objets sous la souris ou sélectionnés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr "Impossible de déplacer des objets en dehors de la Terre."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add Way"
 msgstr "Ajouter un chemin"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add a new way to the data."
 msgstr "Ajouter un nouveau chemin aux données;"
 
-#: ../../../../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."
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#, fuzzy
+msgid ""
+"Warning: This way is incomplete. Try to download it before adding segments."
 msgstr ""
 "Attention : ce chemin est incomplet.Essayez de le télécharger en entier "
 "avant d'ajouter des segments."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, fuzzy, java-format
 msgid ""
@@ -144,9 +506,9 @@
 "Préférez-vous sélectionner tous les segments appartenant à ces chemins ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Ajouter des segments aux chemins"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/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 ""
@@ -154,17 +516,17 @@
 "sélectionné ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Ajouter des segments au chemin ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Réorganiser tous les segments de la ligne ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Réorganiser ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -173,687 +535,307 @@
 msgstr[1] "Créer un nouveau chemin constitué de {0} segments ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 msgid "Create new way"
 msgstr "Créer un nouveau chemin"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add node"
-msgstr "Ajouter un noeud"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add a new node to the map"
-msgstr "Ajouter un nouveau noeud à la carte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add node into segment"
-msgstr "Ajouter un noeud dans un segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add a node into an existing segment"
-msgstr "Ajouter un noeud dans un segment existant"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
-msgid "Can not add a node outside of the world."
-msgstr "Impossible d'ajouter un noeud en dehors de la Terre."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
-msgid "Add Node into Segment"
-msgstr "Ajouter un noeud dans un segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr "Données GPS brutes"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Téléchargement des données GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr "Données OpenStreetMap"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:21
-msgid "Downloading data"
-msgstr "Téléchargement des données"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Aucune donnée importée"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Calque de données"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr "Supprimer des noeuds, des rues ou des segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr "Impossible de supprimer le noeud."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr "Cet objet est en utilisation."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr "Utilisé par plus de deux segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr "Utilisé par un seul segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Segments dans la mauvaise direction."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Clés conflictuelles"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr "Les segments appartiennent à différents chemins."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
+msgstr "Supprimer un noeud"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Déplacer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr "Déplacer les objets sous la souris ou sélectionnés."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
+msgstr "Impossible de déplacer des objets en dehors de la Terre."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#, fuzzy
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
+msgstr ""
+"Zoomer en sélectionnant une zone à la souris. (Ctrl+haut, gauche, bas, "
+"droite, +, -)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+msgid "Add segment"
+msgstr "Ajouter un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+msgid "Add a segment between two nodes."
+msgstr "Ajouter un segment entre deux noeuds."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download from OSM"
+msgstr "Télécharger depuis OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download map data from the OSM server."
+msgstr "Télécharger les données de la carte depuis le serveur OSM."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
+#, fuzzy
+msgid "Download"
+msgstr "Télécharger ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
+#, fuzzy
+msgid "Please select at least one task to download"
+msgstr "Sélectionner au moins un type de données à télécharger."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse segments"
+msgstr "Retourne les segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse the direction of all selected Segments."
+msgstr "Retourne les segments sélectionnés."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:44
+msgid "Please select at least one segment."
+msgstr "Sélectionner au moins un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:55
 msgid "Reverse Segments"
 msgstr "Retourne les segments."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-msgid "Revert the direction of all selected Segments."
-msgstr "Retourne les segments sélectionnés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
-msgid "Please select at least one segment."
-msgstr "Sélectionner au moins un segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
-msgid "Preferences"
-msgstr "Préférences"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-msgid "Open a preferences page for global settings."
-msgstr "Ouvrir la page des préférences pour les réglages généraux."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open"
-msgstr "Ouvrir"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open a file."
-msgstr "Ouvrir un fichier"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr ""
-"L'import des données CSV pour les données non GPS n'est pas encore "
-"implémenté."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Extension de fichier inconnue : {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:59
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Erreur pendant le traitement {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:63
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Impossible de lire \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr "Exécute {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr "Cette fonctionnalité nécessite que des données soient chargées."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr "Impossible d'exécuter la commande {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr "Outils"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-msgstr "Impossible de lire le fichier externe de 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 "Placer les noeuds en cercle"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr "Déplacer les noeuds sélectionnés en un cercle."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-msgstr "Sélectionner au moins quatre noeuds."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr "Renommer le calque"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Renommer également le fichier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Impossible de renommer le fichier \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "File exists. Overwrite?"
+msgstr "Le fichier existe déjà. Écrire dessus ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "Overwrite"
+msgstr "Écrire dessus"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit"
+msgstr "Quitter"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit the application."
+msgstr "Quitter l'application."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+#, fuzzy
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Note : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
+"des traces sous licence GPL."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Exporter en GPX"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Exporter les données en un fichier GPX."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Rien à exporter.Obtenez d'abord des données."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "description de la trace GPS"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Ajouter des informations sur l'auteur"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Nom réel"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Prédéfini"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Année du copyright"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Options d'export"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:78
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:62
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Erreur à l'export {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:79
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+msgid "Error"
+msgstr "Erreur"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Choisir une licence prédéfinie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Annuler"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Annuler la dernière action."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download from OSM"
-msgstr "Télécharger depuis OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download map data from the OSM server."
-msgstr "Télécharger les données de la carte depuis le serveur OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
-msgid ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-msgstr ""
-"Déplacer ou zoomer sur l'image comme pour la carte principale. Sélectionner "
-"une zone à télécharger en faisant glisser la souris bouton principal enfoncé."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
-msgid "Bounding box"
-msgstr "Zone sélectionnée"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
-msgid "min lat"
-msgstr "lat min"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
-msgid "min lon"
-msgstr "lon min"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
-msgid "max lat"
-msgstr "lat max"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
-msgid "max lon"
-msgstr "lon max"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-msgid "Download the following data:"
-msgstr "Téléchargement des données :"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
-msgid "URL from www.openstreetmap.org"
-msgstr "URL à partir de www.openstreetmap.org"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
-msgid "Bookmarks"
-msgstr "Marque-pages"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
-msgid "Please enter the desired coordinates first."
-msgstr "Entrer les coordonnées désirées en premier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
-msgid "Please enter a name for the location."
-msgstr "Entrer un nom pour cet emplacement."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
-msgid "Remove"
-msgstr "Supprimer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
-msgid "Select a bookmark first."
-msgstr "Sélectionner un marque-page en premier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
-msgid "Choose an area"
-msgstr "Choisir une zone"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
-msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr "Entrer les coordonnées désirées ou cliquer sur un marque-page."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-msgid "Please select at least one download data type."
-msgstr "Sélectionner au moins un type de données à télécharger."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit"
-msgstr "Quitter"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit the application."
-msgstr "Quitter l'application."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "About"
-msgstr "À propos"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "Display the about screen."
-msgstr "Montrer l'à propos."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
-#, java-format
-msgid "Java OpenStreetMap Editor Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#, java-format
-msgid "last change at {0}"
-msgstr "dernier changement le {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, java-format
-msgid "Java Version {0}"
-msgstr "Java Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
-msgid "Homepage"
-msgstr "Page d'accueil"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
-msgid "Bug Reports"
-msgstr "Rapports de bug"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "News about JOSM"
-msgstr "Nouveutés sur JOSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
-msgid "Info"
-msgstr "Info"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "Readme"
-msgstr "Lisez-moi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
-msgid "Revision"
-msgstr "Révision"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-msgid "Contribution"
-msgstr "Contribution"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
-msgid "About JOSM..."
-msgstr "À propos de JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
-msgid "File could not be found."
-msgstr "Impossible de trouver le fichier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr "Le document ne contient aucune donnée. Sauvegarder quand même ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr "Document vide"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Certains conflits ne sont pas résolus. Les conflits ne seront pas "
-"sauvegardés si vous ne les traitez pas. Continuer ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr "Conflits"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "File exists. Overwrite?"
-msgstr "Le fichier existe déjà. Écrire dessus ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "Overwrite"
-msgstr "Écrire dessus"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-msgid "data"
-msgstr "données"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-msgid "selection"
-msgstr "sélection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
-msgid "layer"
-msgstr "calque"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
-msgid "conflict"
-msgstr "conflit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
-#, java-format
-msgid "Auto Scale: {0}"
-msgstr "Zoom auto : {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
-#, java-format
-msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
-msgstr ""
-"Zoomer automatiquement sur la vue ({0}) (Annulé si la vue est déplacée)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Sauvegarder sous"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "Fichiers d'un serveur OSM (.osm .xml)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "Fichiers GPX (.gpx)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "Fichiers CSV (.csv .txt)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload to OSM"
-msgstr "Charger sur OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload all changes to the OSM server."
-msgstr "Charger tous les changements sur le serveur OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
-msgid "Nothing to upload. Get some data first."
-msgstr "Rien à charger. Obtenez d'abord des données."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr ""
-"Certains conflits ne sont pas résolus. Vous devez d'abord les résoudre."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Uploading data"
-msgstr "Chargement des données"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
-msgid "No changes to upload."
-msgstr "Aucun changement à charger."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Objects to add:"
-msgstr "Objets à ajouter : "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
-msgid "Objects to modify:"
-msgstr "Objets à modifier : "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
-msgid "Objects to delete:"
-msgstr "Objets à supprimer : "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
-msgid "Upload this changes?"
-msgstr "Charger ces changements ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:54
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr "Aide"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:106
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr ""
-"Les pages d'aide ne peuvent être éditées que depuis l'aide en ligne de JOSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, java-format
-msgid "Downloading {0} segment"
-msgid_plural "Downloading {0} segments"
-msgstr[0] "Téléchargement de {0} segment"
-msgstr[1] "Téléchargement de {0} segments"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+#, fuzzy
+msgid "Select All"
+msgstr "Sélectionner"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
+#, fuzzy, java-format
+msgid "Downloading {0} way"
+msgid_plural "Downloading {0} ways"
+msgstr[0] "TÃÂÃÂ©lÃÂÃÂ©chargement {0} {1}"
+msgstr[1] "TÃÂÃÂ©lÃÂÃÂ©chargement {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download incomplete objects"
 msgstr "Télécharger les objets incomplets"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr ""
 "Télécharger tous les chemins sélectionnés incomplets depuis le serveur OSM."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
 msgid "Please select an incomplete way."
 msgstr "Sélectionner un chemin incomplet"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 #, java-format
 msgid "Download {0} incomplete ways?"
 msgstr "Télécharger {0} chemins incomplets ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 msgid "Download?"
 msgstr "Télécharger ?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Refaire"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refaire la dernière action annulée"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Note : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
-"des traces sous licence GPL."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Exporter en GPX"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Exporter les données en un fichier GPX."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Rien à exporter.Obtenez d'abord des données."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "description de la trace GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Ajouter des informations sur l'auteur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Nom réel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Prédéfini"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Année du copyright"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Mots-clés"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Options d'export"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Erreur à l'export {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Erreur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Choisir une licence prédéfinie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr "Sauvegarder les données actuelles"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr "Sortie en CSV pas encore supportée."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr "Extension de fichier inconnue."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr "Une erreur s'est produite pendant la sauvegarde."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
-#, java-format
-msgid ""
-"The plugin {0} throwed an exception: {1}\n"
-"It may be outdated. Please contact the plugin's autor.\n"
-"This message will not shown again until JOSM is restarted."
-msgstr ""
-"Le greffon {0} signale une exception : {1}\n"
-"Il est possible qu'il ne soit pas à jour. Merci de contacter l'auteur du "
-"greffon.\n"
-"Ce message ne réapparaitra pas jusqu'au prochain démarrage de JOSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Do nothing"
-msgstr "Ne rien faire"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Rapporter un bug"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occoured.\n"
-"\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."
-msgstr ""
-"Une exception inattendue est apparue.\n"
-"\n"
-"Cela est toujours du à une erreur de code. Si vous utilisez la dernière "
-"version de JOSM, il serait aimable de produire un rapport de bug."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Exception inattendue"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-"Merci d'envoyer cela à josm@eigenheimstrasse.de\n"
-"\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-"Merci d'envoyer un e-mail avec les informations suivantes à "
-"josm@eigenheimstrasse.de"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
-msgid "Ctrl-"
-msgstr "Ctrl-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
-msgid "Alt-"
-msgstr "Alt-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
-msgid "AltGr-"
-msgstr "AltGr-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "Shift-"
-msgstr "Shift-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "Une erreur s'est produite avec le greffon {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
 msgid "Load Selection"
 msgstr "Charger la sélection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact de {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Erreur d'analyse dans l'URL : \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Current Selection"
-msgstr "Sélection actuelle"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Open a selection list window."
-msgstr "Afficher une liste de la sélection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "Search"
+msgstr "Chercher"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+msgid "Search for objects."
+msgstr "Rechercher des objets"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
+#, fuzzy
+msgid "No data loaded."
+msgstr "Aucune donnée importée"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
 msgid "Please enter a search string."
 msgstr "Entrer le texte à rechercher."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -870,330 +852,625 @@
 "·key=foot·associé à n'importe quelle valeur.</ul></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
-msgid "Search"
-msgstr "Chercher"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Conflit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Gérer les conflits"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Résoudre"
-
-#: ../../../../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 ""
-"Ouvrir une une fenêtre de fusion des éléments sélectionnés dans cette liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr "Sélectionner"
-
-#: ../../../../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."
-msgstr ""
-"Remplacer les éléments de la carte par les éléments sélectionnés de cette "
-"liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
-msgid "Please select something from the conflict list."
-msgstr "Sélectionnez un élément de la liste des conflits."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-msgid "Resolve Conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "Cliquer sur Recharger pour rafraichir la liste"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Recharger"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Retourner"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Historique"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Afficher l'historique des objets sélectionnés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:59
+msgid "No document open so nothing to save."
+msgstr "Aucun document ouvert donc rien à sauvegarder."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "The document contains no data. Save anyway?"
+msgstr "Le document ne contient aucune donnée. Sauvegarder quand même ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "Empty document"
+msgstr "Document vide"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Certains conflits ne sont pas résolus. Les conflits ne seront pas "
+"sauvegardés si vous ne les traitez pas. Continuer ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid "Conflicts"
+msgstr "Conflits"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "CSV output not supported yet."
+msgstr "Sortie en CSV pas encore supportée."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+msgid "Unknown file extension."
+msgstr "Extension de fichier inconnue."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:108
+#, fuzzy
+msgid "An error occurred while saving."
+msgstr "Une erreur s'est produite pendant la sauvegarde."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+msgid "Split Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+#, fuzzy
+msgid "Split a way at the selected node."
+msgstr "Supprimer le calque sélectionné."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgid "The current selection cannot be used for splitting."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:160
+#, fuzzy
+msgid "The selected node is not part of any way."
+msgid_plural "The selected nodes are not part of any way."
+msgstr[0] "Déplacer les noeuds sélectionnés en un cercle."
+msgstr[1] "Déplacer les noeuds sélectionnés en un cercle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+msgid ""
+"There is more than one way using the node(s) you selected. Please select the "
+"way also."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:176
+#, fuzzy
+msgid "The selected nodes do not share the same way."
+msgstr "Déplacer les noeuds sélectionnés en un cercle."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:190
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:210
+msgid "The selected segment is not part of any way."
+msgid_plural "The selected segments are not part of any way."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+msgid ""
+"There is more than one way using the segment you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the segments you selected. Please select "
+"the way also."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:228
+msgid "The selected segments do not share the same way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#, fuzzy
+msgid "The selected way does not contain the selected segment."
+msgid_plural "The selected way does not contain all the selected segments."
+msgstr[0] "Sélectionner au moins un segment."
+msgstr[1] "Sélectionner au moins un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:245
+#, fuzzy
+msgid "Warning: This way is incomplete. Try to download it before splitting."
+msgstr ""
+"Attention : ce chemin est incomplet.Essayez de le télécharger en entier "
+"avant d'ajouter des segments."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:360
+msgid "The selected segments are not in the same contiguous part of the way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:373
+msgid ""
+"Removing the selected segments would make a part of the way non-contiguous."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:410
+msgid ""
+"The way cannot be split at the selected node. (Hint: To split circular ways, "
+"select two nodes.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:412
+msgid ""
+"The way cannot be split because it is contiguous. (Hint: To split at a node, "
+"select that node.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "About"
+msgstr "À propos"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Display the about screen."
+msgstr "Montrer l'à propos."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#, java-format
+msgid "last change at {0}"
+msgstr "dernier changement le {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java Version {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
+msgid "Homepage"
+msgstr "Page d'accueil"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Bug Reports"
+msgstr "Rapports de bug"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "News about JOSM"
+msgstr "Nouveutés sur JOSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
+msgid "Readme"
+msgstr "Lisez-moi"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
+msgid "Revision"
+msgstr "Révision"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
+msgid "Contribution"
+msgstr "Contribution"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+msgid "About JOSM..."
+msgstr "À propos de JOSM..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "File could not be found."
+msgstr "Impossible de trouver le fichier."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open a file."
+msgstr "Ouvrir un fichier"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:67
+#: ../waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Erreur pendant le traitement {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:70
+#: ../waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Impossible de lire \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:81
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr ""
+"L'import des données CSV pour les données non GPS n'est pas encore "
+"implémenté."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Extension de fichier inconnue : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:104
+#, fuzzy, java-format
+msgid "Tracks from {0}"
+msgstr "Images pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
+#, fuzzy, java-format
+msgid "Markers from {0}"
+msgstr "Images pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:29
+msgid "Downloading data"
+msgstr "Téléchargement des données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:41
+msgid "No data imported."
+msgstr "Aucune donnée importée"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
+msgid "Data Layer"
+msgstr "Calque de données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:50
+msgid "OpenStreetMap data"
+msgstr "Données OpenStreetMap"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:27
+msgid "Downloading GPS data"
+msgstr "Téléchargement des données GPS"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Raw GPS data"
+msgstr "Données GPS brutes"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:23
+#, fuzzy
+msgid "Do not show again"
+msgstr "Ne rien faire"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
+#, fuzzy
+msgid "Information"
+msgstr "Ajouter des informations sur l'auteur"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:61
+#, java-format
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+msgid "Should the plugin be disabled?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+msgid "Disable plugin"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+msgid ""
+"The plugin could not be removed. Please tell the people you got JOSM from "
+"about the problem."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Do nothing"
+msgstr "Ne rien faire"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Report Bug"
+msgstr "Rapporter un bug"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+msgstr ""
+"Une exception inattendue est apparue.\n"
+"\n"
+"Cela est toujours du à une erreur de code. Si vous utilisez la dernière "
+"version de JOSM, il serait aimable de produire un rapport de bug."
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+msgid "Unexpected Exception"
+msgstr "Exception inattendue"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Merci d'envoyer un e-mail avec les informations suivantes à "
+"josm@eigenheimstrasse.de"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:124
+msgid "The text has already been copied to your clipboard."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Ctrl-"
+msgstr "Ctrl-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "Alt-"
+msgstr "Alt-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
+msgid "Shift-"
+msgstr "Shift-"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
+#, fuzzy
+msgid "Downloading incomplete ways..."
+msgstr "Télécharger {0} chemins incomplets ?"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
+msgid "Fix data errors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
+#, fuzzy, java-format
+msgid "Segment {0} is deleted but part of Way {1}"
+msgstr ""
+"Erreur de données : le segment {0} est supprimé mais appartient au chemin {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
+#, fuzzy
+msgid "Data error"
+msgstr "Calque de données"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr ""
+"Erreur de données : le segment {0} est supprimé mais appartient au chemin {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+"Erreur de données : le noeud {0} est supprimé mais appartient au segment {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
+#, fuzzy, java-format
+msgid "Data error: lat value \"{0}\" is out of bounds."
+msgstr "Erreur de données : La valeur de latitude \"{0}\" est hors limite."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
+#, fuzzy, java-format
+msgid "Data error: lon value \"{0}\" is out of bounds."
+msgstr "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Charge {0} {1} ({2})..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+msgid "Unknown host"
+msgstr "Hôte inconnu"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Impossible de détecter le texte de format des données."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#, fuzzy
+msgid ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in preferences."
+msgstr ""
+"Le format des données est incomplet ou non trouvé. Essayez de régler le "
+"format manuellement dans les préférences."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+"Le texte de format est incomplet. Les spécifications 'lat' et 'long' au "
+"minimum sont requises."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Type de données inconnu : \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, fuzzy
+msgid "Maybe add a format string in preferences."
+msgstr "Définissez peut-être le format dans les préférences."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Analyse de l'erreur ligne {0}"
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
+#, fuzzy
+msgid "Contacting OSM Server..."
+msgstr "Contact du serveur OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Téléchargement des points {0} {1}..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+msgid "Downloading OSM data..."
+msgstr "Téléchargement des données OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:116
+msgid "Unknown version"
+msgstr "Version inconnue"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:145
+msgid "Found <seg> tag on non-way."
+msgstr "Tag <seg> trouvé en dehors d'un chemin."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
+msgid "Incomplete segment with id=0"
+msgstr "Le segment avec l'id=0 est incomplet"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
+#, fuzzy
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException.·Certains tags peuvent manquer."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+msgid "Illegal object with id=0"
+msgstr "L'objet avec l'id=0 est illégal"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#, fuzzy
+msgid "Couldn't read time format \"{0}\"."
+msgstr "Impossible de lire le format horaire \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:220
+#, fuzzy, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr "Attribut requis \"{0}\" manquant."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+msgid "Preparing data..."
+msgstr "Préparation des données..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+msgid "Illformed Node id"
+msgstr "id du noeud malformé"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Erreur pendant l'analyse."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Mot de passe ou nom d'utilisateur incorrect."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Attention : Le mot de passe est transféré non-crypté."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
+msgid "Save user and password (unencrypted)"
+msgstr "Sauvegarder l'utilisateur et le mot de passe (non crypté)"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
+msgid "Enter Password"
+msgstr "Entrer un mot de passe"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
+msgid "Aborting..."
+msgstr "Échec..."
+
+#: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Séquence"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Supprime \"{0}\" pour"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Affecte {0}={1} pour"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "objet"
+msgstr[1] "objets"
+
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Résoudre {0} conflits dans {1} objets"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Changer"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Object"
 msgstr "Objet"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Date"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recharger les objets sélectionnés et rafraichir la liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Pas encore implémenté."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Rétablir l'état des objets sélectionnés à la version sélectionnée dans "
-"l'historique."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Command Stack"
-msgstr "Pile de commandes"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Ouvrir une liste de toutes les commandes (annuler le buffer)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-msgid "Please select the objects you want to change properties for."
-msgstr "Sélectionner les objets dont vous voulez changer les propriétés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, java-format
-msgid "This will change {0} object."
-msgid_plural "This will change {0} objects."
-msgstr[0] "Cela changera {0} objet."
-msgstr[1] "Cela changera {0} objets."
-
-#: ../../../../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.)"
-msgstr ""
-"Merci de sélectionner une valeur pour \"{0}\". <br>(une chaîne de caractères "
-"vide supprime la clé)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
-msgid "Change values?"
-msgstr "Changer les valeurs ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
-msgid "<different>"
-msgstr "<différent>"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-msgid "Please select objects for which you want to change properties."
-msgstr "Sélectionnez les objets dont vous voulez changer les propriétés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "Please select a key"
-msgstr "Sélectionner une clé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-msgid "Please select a value"
-msgstr "Sélectionner une valeur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Properties"
-msgstr "Propriétés"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Property for selected objects."
-msgstr "Propriétés des objets sélectionnés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr "Impossible de lire le fichier d'annotations : {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Erreur de traitement {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Cela changera {0} objet."
-msgstr[1] "Change {0} objets."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Key"
-msgstr "Clé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Value"
-msgstr "Valeur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
-msgid "Please select the row to edit."
-msgstr "Sélectionnez l'étage à éditer."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
-msgid "Please select the row to delete."
-msgstr "Sélectionner l'étage à supprimer."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-msgid "Add a new key/value pair to all objects"
-msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-#: ../../plugins/grid/src/grid/GridPlugin.java:43
-#: ../../plugins/grid/src/grid/GridPlugin.java:49
-msgid "Edit"
-msgstr "Éditer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-msgid "Edit the value of the selected key for all objects"
-msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-msgid "Delete the selected key in all objects"
-msgstr "Supprimer la clé sélectionnée de tous les objets"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
-msgid "Delete the selected layer."
-msgstr "Supprimer le calque sélectionné."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
-msgid "Show/Hide"
-msgstr "Montrer/Cacher"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Toggle visible state of the selected layer."
-msgstr "Change la visibilité du calque sélectionné."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Layers"
-msgstr "Calque"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Open a list of all loaded layers."
-msgstr "Ouvrir une liste de tous les calques chargés."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
-msgid "Move the selected layer one row up."
-msgstr "Déplacer le calque sélectionné un étage au-dessus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
-msgid "Move the selected layer one row down."
-msgstr "Déplacer le calque sélectionné un étage en-dessous."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
-msgid "Merge the selected layer into the layer directly below."
-msgstr ""
-"Fusionner les calques sélectionnés dans le calque directement en dessous."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Type inconnu à la ligne : {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 ""
-"Impossible d'avoir une combobox avec des valeurs par défaut (ligne {0})"
-
-#: ../../../../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."
-msgstr ""
-"display_values·({0})·et·values·({1})·doivent contenir le même nombre "
-"d'éléments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "élément"
-msgstr[1] "éléments"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Changer les propriétés"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "noeud"
-msgstr[1] "noeuds"
-
-#: ../../../../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
-msgid "segment"
-msgid_plural "segments"
-msgstr[0] "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
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "chemin"
-msgstr[1] "chemins"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
-msgid "There were conflicts during import."
-msgstr "Il y a eu des conflits pendant l'import."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} consiste en :"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} supprimés)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Convertir en un calque de données"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#, fuzzy
+msgid "http://www.openstreetmap.org/traces"
+msgstr "URL à partir de www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, fuzzy, java-format
+msgid "Converted from: {0}"
+msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:157
 msgid "track"
 msgid_plural "tracks"
@@ -1201,5 +1478,5 @@
 msgstr[1] "traces"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgid "point"
 msgid_plural "points"
@@ -1207,5 +1484,5 @@
 msgstr[1] "points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
 #, java-format
 msgid "a track with {0} point"
@@ -1214,5 +1491,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1221,5 +1498,5 @@
 msgstr[1] "{0} consiste en {1} traces"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} point"
@@ -1228,106 +1505,130 @@
 msgstr[1] "{0} points"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
 msgid "Select line drawing options"
 msgstr "Options de dessin des lignes"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:150
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "OK"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Choisir une couleur"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 msgid "Import images"
 msgstr "Import des images"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:253
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr "images JPEG (*.jpg)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:194
+msgid "There were conflicts during import."
+msgstr "Il y a eu des conflits pendant l'import."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consiste en :"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} supprimés)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr "Images pour {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Lecture du GPS..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Aucune heure pour le point {0}·x·{1}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Impossible de lire l'heure \"{0}\" du point {1} x {2}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr "Aucune image avec des informations horaires lisibles trouvée."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lecture de {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr "Images géomarquées"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Allumage du GPS : {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Extinction du GPS : {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr "variation actuelle : {0}s"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr "différence de fuseau horaire : "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1335,165 +1636,96 @@
 msgstr[1] "images"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dans la trace."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Synchroniser l'horloge"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La date du fichier \"{0}\" ne peut être analysée."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Il n'y a aucune heure EXIF associée au fichier \"{0}\"."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Image"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Entrez la date et l'heure montrées (mm/jj/aaaa HH:MM:SS)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zone horaire de l'unité GPS (différence avec la photo)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr "Synchroniser l'heure avec l'unité GPS"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr "L'heure indiquée ne peut être analysée."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
-msgid "Could not read bookmarks."
-msgstr "Impossible de lire les marque-pages."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
-msgid "Could not write bookmark."
-msgstr "Impossible d'écrire un marque-page."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Java Open Street Map - Editor"
-msgstr "Java Open Street Map - Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
-msgid "layer not in list."
-msgstr "le calque n'est pas dans la liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
-msgid "Hint: Some changes came from uploading new data to the server."
-msgstr ""
-"Indication : Certains changements viennent du chargment de nouvelles données "
-"sur le serveur."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
-msgid "There are unsaved changes. Really quit?"
-msgstr "Certains changements ne sont pas sauvegardés. Quitter quand même ?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
-msgid "Unsaved Changes"
-msgstr "Changements non sauvegardés"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "usage"
-msgstr "usage"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "options"
-msgstr "Options"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-msgid "Show this help"
-msgstr "Montrer cette aide"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-msgid "Standard unix geometry argument"
-msgstr "Argument de géométrie standard UNIX"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-msgid "Download the bounding box"
-msgstr "Télécharge la zone sélectionnée"
-
-#: ../../../../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 "Télécharge l'emplacement donné par l'URL (avec 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 "Ouvrir un fichier (en GPS brut si .gpx ou .csv)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
-msgid "Download the bounding box as raw gps"
-msgstr "Télécharger la zone sélectionnée en GPS brut."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-msgid "Select with the given search"
-msgstr "Sélectionner les résultats de la recherche."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-msgid "Don't launch in fullscreen mode"
-msgstr "Ne pas lancer en plein écran"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-msgid "Reset the preferences to default"
-msgstr "Rétablir les préférences par défaut"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
-msgid "Set the language. Example: "
-msgstr "Choisir la langue. Exemple : "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
-msgid "examples"
-msgstr "exemples"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Les paramètres sont lus dans l'ordre dans lequel ils sont spécifiés, soyez "
-"donc\n"
-"sur d'avoir chargé des données avant --selection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr "Calque"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr "Fichiers"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr "Connexion"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:128
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:146
+#, fuzzy, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} consiste en {1} trace"
+msgstr[1] "{0} consiste en {1} traces"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:86
+msgid "There was an error while trying to play the sound file for this marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:88
+#, fuzzy
+msgid "Error playing sound"
+msgstr "Erreur de traitement {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:42
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "(URL was: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#, fuzzy
+msgid "Error displaying URL"
+msgstr "Erreur de traitement {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
 msgid "Contacting the OSM server..."
 msgstr "Contact du serveur OSM..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Lat/Lon"
-msgstr "Lat/Lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Key"
+msgstr "Clé"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Value"
+msgstr "Valeur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1502,173 +1734,155 @@
 msgstr[1] "{0} objets sont conflictuels :"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
 msgid "my version:"
 msgstr "ma version :"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
 msgid "their version:"
 msgstr "version du serveur : "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
 msgid "resolved version:"
 msgstr "version choisie : "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
-msgid "Error while parsing"
-msgstr "Erreur d'analyse"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
-msgid "File Not found"
-msgstr "Fichier non trouvé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "string"
-msgstr "texte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-msgid "Name of the user."
-msgstr "Nom de l'utilisateur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-msgid "OSM Password."
-msgstr "Mot de passe OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-"Redimensionner l'applet aux proportions donnnées (format LARGEURxHAUTEUR)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "string;string;..."
-msgstr "texte;texte;..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Les télécharge tous. Peut être sous la forme \"x1,y1,x2,z2\" ou un URL "
-"contenant lat=y&lon=x&zoom=z ou encore un nom de fichier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2,"
-"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
-msgstr ""
-"Les ajoute tous à la sélection initale. Cela peut être un texte de recherche "
-"comme pour Google ou un URL retournant du osm-xml"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "any"
-msgstr "n'importe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
-"Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
-msgid "You have to restart JOSM for some settings to take effect."
-msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
-msgid "Draw lines between raw gps points."
-msgstr "Dessiner des lignes entre les points GPS bruts."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
-msgid "Force lines if no segments imported."
-msgstr "Forcer les lignes si aucun segment importé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
-msgid "Draw large GPS points."
-msgstr "Dessiner de gros points GPS."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
-msgid "Draw Direction Arrows"
-msgstr "Dessiner les flèches de direction"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
-msgstr ""
-"Force le dessin de lignes si les données importées ne contiennent pas "
-"d'informationsur les lignes."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
-msgid "Draw larger dots for the GPS points."
-msgstr "Dessine de plus gros points GPS."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
-msgid "Draw direction hints for all segments."
-msgstr "Dessine les flèches de direction pour tous les segments."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
-msgid "Color"
-msgstr "Couleur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
-msgid "Name"
-msgstr "Nom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
-msgid "Choose"
-msgstr "Choisir"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
-msgid "Please select a color."
-msgstr "Sélectionner une couleur"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
-#, java-format
-msgid "Choose a color for {0}"
-msgstr "Choisir une couleur pour {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
-msgid "Annotation preset source"
-msgstr "Source du fichier d'annotations"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
-msgid "The base URL to the OSM server (REST API)"
-msgstr "L'URL de base du serveur OSM (API)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
-msgid "Login name (email) to the OSM account."
-msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Mot de passe d'identification au compte OSM. Laisser blanc pour ne stocker "
-"aucun mot de passe."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
-msgid "The base URL to the server retrieving WMS background pictures from."
-msgstr "L'URL du serveur récupérant les images de l'arrière-plan WMS."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+msgid "Layer"
+msgstr "Calque"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+msgid "Edit"
+msgstr "Éditer"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
+#: ../osmarender/src/OsmarenderPlugin.java:98
+#: ../osmarender/src/OsmarenderPlugin.java:104
+msgid "View"
+msgstr "Voir"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
+msgid "Files"
+msgstr "Fichiers"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
+msgid "Tools"
+msgstr "Outils"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
+#, fuzzy
+msgid "Zoom To"
+msgstr "Zoom"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:28
+msgid "Projection method"
+msgstr "Méthode de projection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#, fuzzy
+msgid "Configure available plugins."
+msgstr "Configurer les greffons disponibles."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+msgid "Get more plugins"
+msgstr "Obtenir plus de greffons"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#, java-format
+msgid "Downloaded plugin information from {0} site"
+msgid_plural "Downloaded plugin information from {0} sites"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#, fuzzy
+msgid "No plugin information found."
+msgstr "Greffon non trouvé : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#, fuzzy
+msgid "Update current"
+msgstr "Sauvegarder les données actuelles"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+msgid "Not implemented yet."
+msgstr "Pas encore implémenté."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#, fuzzy
+msgid "Configure Plugin Sites"
+msgstr "Configurer les greffons disponibles."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:116
+msgid "Plugin bundled with JOSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:160
+#, java-format
+msgid "Error reading plugin information file: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:186
+#, fuzzy, java-format
+msgid ""
+"Download the following plugins?\n"
+"\n"
+"{0}"
+msgstr "Téléchargement des données :"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#, fuzzy
+msgid "Download missing plugins"
+msgstr "Téléchargement des données"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+#, fuzzy
+msgid "Advanced Preferences"
+msgstr "Préférences"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:64
+#, fuzzy
+msgid "Enter a new key/value pair"
+msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Please select the row to delete."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
+msgstr "Sélectionnez l'étage à éditer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Images pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Apparence et comportement"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1687,7 +1901,42 @@
 "par une virgule.</html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
-msgid ""
-"If your gps device draw to few lines, select this to draw lines along your "
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr ""
+"Spécifications de l'import CSV (vide : lire depuis la première ligne de "
+"données)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Dessiner des lignes entre les points GPS bruts."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+msgid "Force lines if no segments imported."
+msgstr "Forcer les lignes si aucun segment importé"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+msgid "Draw large GPS points."
+msgstr "Dessiner de gros points GPS."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+msgid "Draw Direction Arrows"
+msgstr "Dessiner les flèches de direction"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+#, fuzzy
+msgid ""
+"If your gps device draw too few lines, select this to draw lines along your "
 "way."
 msgstr ""
@@ -1695,29 +1944,37 @@
 "dessiner des lignes le long de votre chemin."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
-msgid "Colors used by different objects in JOSM."
-msgstr "Couleurs utilisées par les différents objets de JOSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
-msgid ""
-"The sources (url or filename) of annotation preset definition files. See "
-"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
-msgstr ""
-"Sources (URL ou fichier) des fichiers d'annotations prédéfinies. Voir http://"
-"josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
-msgid "Add a new annotation preset source to the list."
-msgstr "Ajouter un nouveau fichier d'annotations à la liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
-msgid "Delete the selected source from the list."
-msgstr "Supprimer la source sélectionné de la liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Force le dessin de lignes si les données importées ne contiennent pas "
+"d'informationsur les lignes."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Draw larger dots for the GPS points."
+msgstr "Dessine de plus gros points GPS."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Draw direction hints for all segments."
+msgstr "Dessine les flèches de direction pour tous les segments."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+msgid "Draw the order numbers of all segments within their way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#, fuzzy
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Télécharger les données de la carte depuis le serveur OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgid "Draw the inactive data layers in a different color."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
 msgid "Display Settings"
 msgstr "Réglages d'affichage"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1725,33 +1982,119 @@
 msgstr "Divers réglages de l'apparence de tout le programme."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
-msgid "Look and Feel"
-msgstr "Apparence et comportement"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings"
+msgstr "Réglages de connexion"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#, fuzzy
+msgid "Connection Settings for the OSM server."
+msgstr "Réglages de connexion au serveur OSM"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Map Settings"
+msgstr "Réglages de la carte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Settings for the map projection and data interpretation."
+msgstr ""
+"Réglages pour la projection de la carte et l'interprétation des données."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:78
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:53
+#, fuzzy
+msgid "Tagging preset source"
+msgstr "Source du fichier d'annotations"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#, fuzzy
+msgid ""
+"The sources (url or filename) of tagging preset definition files. See http://"
+"josm.eigenheimstrasse.de/wiki/TaggingPresets for help."
+msgstr ""
+"Sources (URL ou fichier) des fichiers d'annotations prédéfinies. Voir http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#, fuzzy
+msgid "Add a new tagging preset source to the list."
+msgstr "Ajouter un nouveau fichier d'annotations à la liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
+msgid "Delete the selected source from the list."
+msgstr "Supprimer la source sélectionné de la liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#, fuzzy
+msgid "Tagging preset sources"
+msgstr "Sources des annotations prédéfinies"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:48
+msgid "Color"
+msgstr "Couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:49
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Nom"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
+msgid "Choose"
+msgstr "Choisir"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:122
+msgid "Please select a color."
+msgstr "Sélectionner une couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:127
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choisir une couleur pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:132
+msgid "Colors used by different objects in JOSM."
+msgstr "Couleurs utilisées par les différents objets de JOSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings"
-msgstr "Réglages de connexion"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings to the OSM server."
-msgstr "Réglages de connexion au serveur OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
+#, fuzzy
+msgid "The base URL for the OSM server (REST API)"
+msgstr "L'URL de base du serveur OSM (API)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgid "Login name (email) to the OSM account."
+msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Mot de passe d'identification au compte OSM. Laisser blanc pour ne stocker "
+"aucun mot de passe."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
 msgid "OSM username (email)"
 msgstr "Nom d'utilisateur OSM (e-mail)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1763,362 +2106,1351 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
-msgid "CSV import specification (empty: read from first line in data)"
-msgstr ""
-"Spécifications de l'import CSV (vide : lire depuis la première ligne de "
-"données)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Map Settings"
-msgstr "Réglages de la carte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Settings for the map projection and data interpretation."
-msgstr ""
-"Réglages pour la projection de la carte et l'interprétation des données."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
-msgid "Projection method"
-msgstr "Méthode de projection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
-msgid "Annotation preset sources"
-msgstr "Sources des annotations prédéfinies"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Plugins"
-msgstr "Greffons"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Configure available Plugins."
-msgstr "Configurer les greffons disponibles."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
-msgid "Get more plugins"
-msgstr "Obtenir plus de greffons"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Téléchargement des points {0} {1}..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Téléchargement des données OSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
-msgid "Unknown version"
-msgstr "Version inconnue"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
-msgid "Found <seg> tag on non-way."
-msgstr "Tag <seg> trouvé en dehors d'un chemin."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
-msgid "Incomplete segment with id=0"
-msgstr "Le segment avec l'id=0 est incomplet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
+msgid "Could not read bookmarks."
+msgstr "Impossible de lire les marque-pages."
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
+msgid "Could not write bookmark."
+msgstr "Impossible d'écrire un marque-page."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:109
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#, fuzzy
+msgid "Java OpenStreetMap - Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:147
+msgid "layer not in list."
+msgstr "le calque n'est pas dans la liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+msgid "Getting Started"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
+#, fuzzy
+msgid "[Download] some data from the OSM server"
+msgstr "Télécharger les données de la carte depuis le serveur OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
+msgid "Getting Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:68
+msgid "Open the [online help] (english only)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+msgid "Watch some [tutorial videos]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Join the newbie [mailing list]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:191
+#, fuzzy
+msgid "Unknown type"
+msgstr "Hôte inconnu"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:241
+#, fuzzy, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "Impossible de lire le fichier d'annotations : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:244
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Erreur de traitement {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:277
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Cela changera {0} objet."
+msgstr[1] "Change {0} objets."
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:307
+msgid "Change Properties"
+msgstr "Changer les propriétés"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload Preferences"
+msgstr "Préférences"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload the current preferences to the server"
+msgstr "Charger tous les changements sur le serveur OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+msgid "string"
+msgstr "texte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+msgid "Name of the user."
+msgstr "Nom de l'utilisateur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+msgid "OSM Password."
+msgstr "Mot de passe OSM"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+#, fuzzy
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr ""
+"Redimensionner l'applet aux proportions donnnées (format LARGEURxHAUTEUR)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid "string;string;..."
+msgstr "texte;texte;..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Les télécharge tous. Peut être sous la forme \"x1,y1,x2,z2\" ou un URL "
+"contenant lat=y&lon=x&zoom=z ou encore un nom de fichier."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2,"
+"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+msgstr ""
+"Les ajoute tous à la sélection initale. Cela peut être un texte de recherche "
+"comme pour Google ou un URL retournant du osm-xml"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "any"
+msgstr "n'importe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+"Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Click Reload to refresh list"
+msgstr "Cliquer sur Recharger pour rafraichir la liste"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+msgid "Reload"
+msgstr "Recharger"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Revert"
+msgstr "Retourner"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "History"
+msgstr "Historique"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "Display the history of all selected items."
+msgstr "Afficher l'historique des objets sélectionnés."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
+msgid "Date"
+msgstr "Date"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Recharger les objets sélectionnés et rafraichir la liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:142
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Rétablir l'état des objets sélectionnés à la version sélectionnée dans "
+"l'historique."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+msgid "Delete the selected layer."
+msgstr "Supprimer le calque sélectionné."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:70
+msgid "Do you really want to delete the whole layer?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+msgid "Show/Hide"
+msgstr "Montrer/Cacher"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+msgid "Toggle visible state of the selected layer."
+msgstr "Change la visibilité du calque sélectionné."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#, fuzzy
+msgid "Show/Hide Text"
+msgstr "Montrer/Cacher"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#, fuzzy
+msgid "Toggle visible state of the marker text."
+msgstr "Change la visibilité du calque sélectionné."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Layers"
+msgstr "Calque"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Ouvrir une liste de tous les calques chargés."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:221
+msgid "Move the selected layer one row up."
+msgstr "Déplacer le calque sélectionné un étage au-dessus."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:227
+msgid "Move the selected layer one row down."
+msgstr "Déplacer le calque sélectionné un étage en-dessous."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:241
+msgid "Merge the selected layer into the layer directly below."
+msgstr ""
+"Fusionner les calques sélectionnés dans le calque directement en dessous."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Conflict"
+msgstr "Conflit"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Merging conflicts."
+msgstr "Gérer les conflits"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Resolve"
+msgstr "Résoudre"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Ouvrir une une fenêtre de fusion des éléments sélectionnés dans cette liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid "Select"
+msgstr "Sélectionner"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Remplacer les éléments de la carte par les éléments sélectionnés de cette "
+"liste."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:109
+msgid "Please select something from the conflict list."
+msgstr "Sélectionnez un élément de la liste des conflits."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "Resolve Conflicts"
+msgstr "Résoudre les conflits"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Authors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Open a list of people working on the selected objects."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+msgid "Author"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+#, fuzzy
+msgid "# Objects"
+msgstr "Objet"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
+msgid "Please select the objects you want to change properties for."
+msgstr "Sélectionner les objets dont vous voulez changer les propriétés."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Cela changera {0} objet."
+msgstr[1] "Cela changera {0} objets."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+msgid "An empty value deletes the key."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+msgid "Change values?"
+msgstr "Changer les valeurs ?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:394
+msgid "<different>"
+msgstr "<différent>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:160
+#, fuzzy, java-format
+msgid "Change properties of {0} object"
+msgid_plural "Change properties of {0} objects"
+msgstr[0] "Cela changera {0} objet."
+msgstr[1] "Change {0} objets."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+msgid "Please select objects for which you want to change properties."
+msgstr "Sélectionnez les objets dont vous voulez changer les propriétés."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+msgid "Please select a key"
+msgstr "Sélectionner une clé"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+msgid "Please select a value"
+msgstr "Sélectionner une valeur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+msgid "Properties"
+msgstr "Propriétés"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+#, fuzzy
+msgid "Properties for selected objects."
+msgstr "Propriétés des objets sélectionnés."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+msgid "Add a new key/value pair to all objects"
+msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+msgid "Edit the value of the selected key for all objects"
+msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+msgid "Delete the selected key in all objects"
+msgstr "Supprimer la clé sélectionnée de tous les objets"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Pile de commandes"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Ouvrir une liste de toutes les commandes (annuler le buffer)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Current Selection"
+msgstr "Sélection actuelle"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Open a selection list window."
+msgstr "Afficher une liste de la sélection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
+msgid "Error while parsing"
+msgstr "Erreur d'analyse"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+#, fuzzy
+msgid "File not found"
+msgstr "Fichier non trouvé"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:49
+msgid "You can paste an URL here to download the area."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lat"
+msgstr "lat min"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "min lon"
+msgstr "lon min"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lat"
+msgstr "lat max"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+msgid "max lon"
+msgstr "lon max"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "URL from www.openstreetmap.org"
+msgstr "URL à partir de www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:166
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:169
+msgid "Download area ok, size probably acceptable to server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:99
+msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:64
+msgid "Please enter the desired coordinates first."
+msgstr "Entrer les coordonnées désirées en premier."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
+msgid "Please enter a name for the location."
+msgstr "Entrer un nom pour cet emplacement."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Select a bookmark first."
+msgstr "Sélectionner un marque-page en premier."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:74
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:106
+#, fuzzy
+msgid "Download Area"
+msgstr "Télécharger ?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgid "usage"
+msgstr "usage"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+msgid "options"
+msgstr "Options"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+msgid "Show this help"
+msgstr "Montrer cette aide"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid "Standard unix geometry argument"
+msgstr "Argument de géométrie standard UNIX"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgid "Download the bounding box"
+msgstr "Télécharge la zone sélectionnée"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Télécharge l'emplacement donné par l'URL (avec lat=x&lon=y&zoom=z)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Ouvrir un fichier (en GPS brut si .gpx ou .csv)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid "Download the bounding box as raw gps"
+msgstr "Télécharger la zone sélectionnée en GPS brut."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgid "Select with the given search"
+msgstr "Sélectionner les résultats de la recherche."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Don't launch in fullscreen mode"
+msgstr "Ne pas lancer en plein écran"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "Reset the preferences to default"
+msgstr "Rétablir les préférences par défaut"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
+msgid "Set the language. Example: "
+msgstr "Choisir la langue. Exemple : "
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "examples"
+msgstr "exemples"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Les paramètres sont lus dans l'ordre dans lequel ils sont spécifiés, soyez "
+"donc\n"
+"sur d'avoir chargé des données avant --selection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:92
+#, java-format
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:95
+#, fuzzy, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr "Impossible de charger le greffon \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "Une erreur s'est produite avec le greffon {0}"
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:193
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Latitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:195
+#: ../livegps/livegps/LiveGpsDialog.java:57
+msgid "Longitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:200
+#, fuzzy
+msgid "Grid layout"
+msgstr "calque"
+
+#: ../grid/src/grid/GridLayer.java:222
+#, fuzzy
+msgid "Grid layer:"
+msgstr "calque"
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:34
+#, java-format
+msgid ""
+"Do you want to load a basic tagging preset for your language ({0})?\n"
+"This is recommend for beginners of JOSM.\n"
+"\n"
+"'Cancel' will ask this question on next start again."
+msgstr ""
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:35
+msgid "Language Plugin detected"
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:86
+msgid "FireFox not found. Please set firefox executable in the preferences."
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:135
+#, fuzzy
+msgid "osmarender options"
+msgstr "Options d'export"
+
+#: ../osmarender/src/OsmarenderPlugin.java:136
+msgid "FireFox executable"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+#, fuzzy
+msgid "Version"
+msgstr "Révision"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
+#, fuzzy
+msgid "Update"
+msgstr "données"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+#, fuzzy
+msgid "Add Site"
+msgstr "Ajouter un noeud"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
+msgid "Update Site Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+msgid "Invalid Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+#, fuzzy
+msgid "Delete Site(s)"
+msgstr "Supprimer un noeud"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+#, fuzzy
+msgid "Please select the site to delete."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
+#, fuzzy
+msgid "Please select the site(s) to check for updates."
+msgstr "Sélectionner au moins quatre noeuds."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+#, fuzzy
+msgid "Delete the selected site(s) from the list."
+msgstr "Supprimer la source sélectionné de la liste."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
+msgid "Update Sites"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
+#, fuzzy, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr "Erreur de traitement {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+msgid "No validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+#, fuzzy
+msgid "Open the validation window."
+msgstr "Afficher une liste de la sélection"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+msgid ""
+"A OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "dernier changement le {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:35
+#, fuzzy
+msgid "Single node segments."
+msgstr "Ajouter un noeud dans un segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:36
+msgid ""
+"This test checks that there are no segments with the same node as start and "
+"destination."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:44
+#, fuzzy
+msgid "Single node segments"
+msgstr "Ajouter un noeud dans un segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+#, fuzzy
+msgid "Untagged nodes."
+msgstr "Changements non sauvegardés"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+msgid "This test checks for untagged nodes that are not part of any segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:97
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:30
+msgid "Crossing roads."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:31
+msgid ""
+"This test checks if two roads,railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:83
+msgid "Crossing roads"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:26
+#, fuzzy
+msgid "Reused segments."
+msgstr "Retourne les segments."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:27
+msgid "This test checks if a segment is used in more than one way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:45
+#, fuzzy
+msgid "Reused segments"
+msgstr "Retourne les segments."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
+#, fuzzy
+msgid "Tagged segments"
+msgstr "segments"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:30
+msgid "This test checks that no segment is tagged. Only ways should be tagged."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:45
+msgid "Segments with tags"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:29
+msgid "Similar named ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:30
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:75
+msgid "Similar named ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Supprime \"{0}\" pour"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:29
+msgid "Duplicated segments."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:30
+msgid "This test checks that two nodes are not used by more than one segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:48
+#, fuzzy
+msgid "Duplicated segments"
+msgstr "Ajouter un segment."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:22
+msgid "Unordered ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:23
+msgid "This test checks that all segments in a way are properly ordered."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:34
+msgid "Unordered ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:111
+#, fuzzy
+msgid "Properties checker."
+msgstr "Propriétés"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:112
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:178
+#, fuzzy, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr "Impossible de renommer le fichier \"{0}\"."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:241
+msgid "Tags with empty values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:246
+msgid "Invalid property keys"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:254
+msgid "Unknown property values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:262
+msgid "FIXMES"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:370
+#, fuzzy
+msgid "Check property keys."
+msgstr "Changer les propriétés"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:371
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:403
+msgid "Spellcheck source"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:423
+#, fuzzy
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+msgstr ""
+"Sources (URL ou fichier) des fichiers d'annotations prédéfinies. Voir http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+#, fuzzy
+msgid "Add a new spellcheck source to the list."
+msgstr "Ajouter un nouveau fichier d'annotations à la liste."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:425
+#, fuzzy
+msgid "Edit the selected source."
+msgstr "Supprimer le calque sélectionné."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:428
+msgid "Spellcheck data sources"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:450
+#, fuzzy
+msgid "Check property values."
+msgstr "Changer les propriétés"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:451
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:459
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:460
+msgid "Looks for nodes, segments or ways with FIXME in any property value."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:28
+#, fuzzy
+msgid "Orphaned segments."
+msgstr "Ajouter un segment."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:29
+msgid "This test checks that every segment is in a way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:44
+#, fuzzy
+msgid "Segments not in a way"
+msgstr "Ajouter des segments au chemin ?"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:37
+#, fuzzy
+msgid "Untagged ways."
+msgstr "Images géomarquées"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:38
+msgid "This test checks for untagged ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:66
+#, fuzzy
+msgid "Unnamed ways"
+msgstr "sans-nom"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
+#, fuzzy
+msgid "Untagged ways"
+msgstr "Images géomarquées"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+msgid "Duplicated nodes."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:109
+#, fuzzy
+msgid "Nodes have conflicting key: "
+msgstr "Clés conflictuelles"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
+#, fuzzy
+msgid "Merge Nodes"
+msgstr "Supprimer un noeud"
+
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
+msgid "WMS"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Mauvaise transformation de longitude pour le cache. Ne peut pas opérer sur "
+"{0}"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+#, fuzzy
+msgid "WMS Plugin Preferences"
+msgstr "Préférences"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:24
+#, fuzzy
+msgid "Downloading "
+msgstr "Téléchargement des données"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
+msgid ""
+"<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
+"<b>must</b> be configured with the javascript 'dump' method,<br>that can be "
+"activated with the property 'browser.dom.window.dump.enabled=true' in the "
+"about:config page.</html>"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
+msgid ""
+"<html>The port that the server will use to listen WMS requests<br>The WMS "
+"plugin need to be configured to use this port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
+msgid ""
+"<html>Name of the profile.<br>This profile is used to avoid nag firefox "
+"screens asking you to resume failed sessions.<br>Just set the selected "
+"profile as not default in the profile selection window and configure to not "
+"ask<br>about failed sessions with 'browser.sessionstore."
+"resume_from_crash=false' in the about:config page"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Yahoo! WMS server"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Settings for the Yahoo! imagery server."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
+#, fuzzy
+msgid "YWMS options"
+msgstr "Options"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
+msgid "Firefox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
+msgid "Firefox profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
+#, fuzzy
+msgid "Create"
+msgstr "Créer un nouveau chemin"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
+msgid "Server port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
+#, fuzzy
+msgid "Please name the profile you want to create."
+msgstr "Sélectionner les objets dont vous voulez changer les propriétés."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
+msgid "Creating profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
+msgid "You have to select some segments that don't belong to any way."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy, java-format
+msgid "Create {0} way from {1} segments?"
+msgid_plural "Create {0} ways from {1} segments?"
+msgstr[0] "Créer un nouveau chemin constitué de {0} segment ?"
+msgstr[1] "Créer un nouveau chemin constitué de {0} segments ?"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy
+msgid "Create ways"
+msgstr "Créer un nouveau chemin"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:82
+#, fuzzy
+msgid "Create linear ways"
+msgstr "Créer un nouveau chemin"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "chemin"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, fuzzy, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:56
+msgid "start"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:58
+msgid "end"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:43
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:53
+msgid "Center Once"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:64
+msgid "Auto-Center on current position"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:95
+#: ../livegps/livegps/LiveGpsAcquirer.java:110
+#, fuzzy
+msgid "Connecting"
+msgstr "Connexion"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:169
+#, fuzzy
+msgid "Connected"
+msgstr "Connexion"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:181
+#: ../livegps/livegps/LiveGpsAcquirer.java:196
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:190
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Connexion"
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Données GPS brutes"
+
+#: ../livegps/livegps/LiveGpsDialog.java:51
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#, fuzzy
+msgid "Way Info"
+msgstr "Info"
+
+#: ../livegps/livegps/LiveGpsDialog.java:59
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:61
+#, fuzzy
+msgid "Course"
+msgstr "Choisir"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid "Tagging Preset Tester"
+msgstr "Testeur d'annotations prédéfinies"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+"Ouvrir le testeur d'annotations prédéfinies pour en prévisualiser le "
+"fonctionnement."
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+#, fuzzy
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr ""
+"Vous devez d'abord spécifier la source des annotations dans les préférences."
+
+#: ../namefinder/namefinder/PlaceSelection.java:39
+#, fuzzy
+msgid "Search..."
+msgstr "Chercher"
+
+#: ../namefinder/namefinder/PlaceSelection.java:101
 msgid "NullPointerException. Possible some missing tags."
 msgstr "NullPointerException.·Certains tags peuvent manquer."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
-msgid "Illegal object with id=0"
-msgstr "L'objet avec l'id=0 est illégal"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr "Impossible de lire le format horaire \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr "Attribut requis \"{0}\" manquant."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
-msgid "Preparing data..."
-msgstr "Préparation des données..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
-msgid "Illformed Node id"
-msgstr "id du noeud malformé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
-#, java-format
-msgid "Upload {0} {1} ({2})..."
-msgstr "Charge {0} {1} ({2})..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
-msgid "Unknown host"
-msgstr "Hôte inconnu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
-#: ../../plugins/waypoints/src/WaypointReader.java:55
+#: ../namefinder/namefinder/PlaceSelection.java:150
+msgid "Cannot read place search results from server"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:159
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:166
+msgid "Places"
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:55
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr "Erreur de données : La valeur de latitude \"{0}\" est hors limite."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
-#: ../../plugins/waypoints/src/WaypointReader.java:59
+#: ../waypoints/src/WaypointReader.java:59
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
-msgid "Could not detect data format string."
-msgstr "Impossible de détecter le texte de format des données."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
-msgid ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-msgstr ""
-"Le format des données est incomplet ou non trouvé. Essayez de régler le "
-"format manuellement dans les préférences."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-"Le texte de format est incomplet. Les spécifications 'lat' et 'long' au "
-"minimum sont requises."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-#, java-format
-msgid "Unknown data type: \"{0}\"."
-msgstr "Type de données inconnu : \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-msgid "Maybe add an format string in preferences."
-msgstr "Définissez peut-être le format dans les préférences."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr "Analyse de l'erreur ligne {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
-msgid "Incorrect password or username."
-msgstr "Mot de passe ou nom d'utilisateur incorrect."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Attention : Le mot de passe est transféré non-crypté."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Save user and password (unencrypted)"
-msgstr "Sauvegarder l'utilisateur et le mot de passe (non crypté)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
-msgid "Enter Password"
-msgstr "Entrer un mot de passe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
-msgid "Aborting..."
-msgstr "Échec..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr ""
-"Erreur de données : le segment {0} est supprimé mais appartient au chemin {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 ""
-"Erreur de données : le noeud {0} est supprimé mais appartient au segment {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr "Erreur pendant l'analyse."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr "position"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr "différent"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr "supprimé"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr "vrai"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr "faux"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr "rien"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr "segments"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
-msgid "to"
-msgstr "depuis"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
-msgid "from"
-msgstr "à"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "new"
-msgstr "nouveau"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "unknown"
-msgstr "inconnu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} noeud"
-msgstr[1] "{0} noeuds"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
-msgid "incomplete"
-msgstr "incomplet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-msgid "background"
-msgstr "arrière plan"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
-msgid "incomplete way"
-msgstr "chemin incomplet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
-msgid "selected"
-msgstr "sélectionné"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
-msgid "gps point"
-msgstr "point GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
-msgid "scale"
-msgstr "mesure"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Résoudre {0} conflits dans {1} objets"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr "Changer"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
-msgid "Sequence"
-msgstr "Séquence"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr "Supprime \"{0}\" pour"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr "Affecte {0}={1} pour"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "objet"
-msgstr[1] "objets"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
-#, java-format
-msgid "Plugin not found: {0}."
-msgstr "Greffon non trouvé : {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, java-format
-msgid "Could not load plugin {0}."
-msgstr "Impossible de charger le greffon \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
-msgid "unnamed"
-msgstr "sans-nom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271
-msgid "The projection could not be read from preferences. Using EPSG:4263."
-msgstr ""
-"La projection ne peut être lue depuis les préférences. EPSG:4263 sera "
-"utilisé."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignore l'URL malformé : \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignore le fichier malformé d'URL : \"{0}\""
-
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:102
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:108
-msgid "View"
-msgstr "Voir"
-
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:18
-msgid "Landsat background images"
-msgstr "Images satellites landsat"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr ""
-"Mauvaise transformation de longitude pour le cache. Ne peut pas opérer sur "
-"{0}"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:70
-#, java-format
-msgid "WMS layer: {0}"
-msgstr "calque WMS :{0}"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr "Testeur d'annotations prédéfinies"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr ""
-"Ouvrir le testeur d'annotations prédéfinies pour en prévisualiser le "
-"fonctionnement."
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-"Vous devez d'abord spécifier la source des annotations dans les préférences."
-
-#: ../../plugins/grid/src/grid/GridLayer.java:74
-#, fuzzy
-msgid "Grid layer:"
-msgstr "calque"
-
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open waypoints file"
 msgstr "Ouvrir un fichier"
 
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open a waypoints file."
 msgstr "Ouvrir un fichier"
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#, fuzzy
+msgid "Please select a scheme to use."
+msgstr "Sélectionnez l'étage à éditer."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
+#, fuzzy
+msgid "Please select the scheme to delete."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
+#, fuzzy
+msgid "Use the selected scheme from the list."
+msgstr "Supprimer la source sélectionné de la liste."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#, fuzzy
+msgid "Use the current colors as a new color scheme."
+msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#, fuzzy
+msgid "Delete the selected scheme from the list."
+msgstr "Supprimer la source sélectionné de la liste."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#, fuzzy
+msgid "Color Schemes"
+msgstr "Couleurs"
+
+#~ msgid "Add Node into Segment"
+#~ msgstr "Ajouter un noeud dans un segment"
+
+#~ msgid "Executing {0}"
+#~ msgstr "Exécute {0}"
+
+#~ msgid "The Tool requires some data to be loaded."
+#~ msgstr "Cette fonctionnalité nécessite que des données soient chargées."
+
+#~ msgid "Could not execute command: {0}"
+#~ msgstr "Impossible d'exécuter la commande {0}"
+
+#~ msgid "Could not read external tool configuration."
+#~ msgstr "Impossible de lire le fichier externe de configuration."
+
+#~ msgid ""
+#~ "Move and zoom the image like the main map. Select an area to download by "
+#~ "dragging."
+#~ msgstr ""
+#~ "Déplacer ou zoomer sur l'image comme pour la carte principale. "
+#~ "Sélectionner une zone à télécharger en faisant glisser la souris bouton "
+#~ "principal enfoncé."
+
+#~ msgid "Bounding box"
+#~ msgstr "Zone sélectionnée"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Marque-pages"
+
+#~ msgid "Choose an area"
+#~ msgstr "Choisir une zone"
+
+#~ msgid "Please enter the desired coordinates or click on a bookmark."
+#~ msgstr "Entrer les coordonnées désirées ou cliquer sur un marque-page."
+
+#~ msgid "Auto Scale: {0}"
+#~ msgstr "Zoom auto : {0}"
+
+#~ msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+#~ msgstr ""
+#~ "Zoomer automatiquement sur la vue ({0}) (Annulé si la vue est déplacée)"
+
+#~ msgid "Downloading {0} segment"
+#~ msgid_plural "Downloading {0} segments"
+#~ msgstr[0] "Téléchargement de {0} segment"
+#~ msgstr[1] "Téléchargement de {0} segments"
+
+#~ msgid ""
+#~ "The plugin {0} throwed an exception: {1}\n"
+#~ "It may be outdated. Please contact the plugin's autor.\n"
+#~ "This message will not shown again until JOSM is restarted."
+#~ msgstr ""
+#~ "Le greffon {0} signale une exception : {1}\n"
+#~ "Il est possible qu'il ne soit pas à jour. Merci de contacter l'auteur du "
+#~ "greffon.\n"
+#~ "Ce message ne réapparaitra pas jusqu'au prochain démarrage de JOSM."
+
+#~ msgid ""
+#~ "Please send this to josm@eigenheimstrasse.de\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Merci d'envoyer cela à josm@eigenheimstrasse.de\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+#~ msgstr ""
+#~ "Merci de sélectionner une valeur pour \"{0}\". <br>(une chaîne de "
+#~ "caractères vide supprime la clé)"
+
+#~ msgid "Unknown type at line {0}"
+#~ msgstr "Type inconnu à la ligne : {0}"
+
+#~ msgid "Cannot have a writable combobox with default values (line {0})"
+#~ msgstr ""
+#~ "Impossible d'avoir une combobox avec des valeurs par défaut (ligne {0})"
+
+#~ msgid ""
+#~ "display_values ({0}) and values ({1}) must be of same number of elements."
+#~ msgstr ""
+#~ "display_values·({0})·et·values·({1})·doivent contenir le même nombre "
+#~ "d'éléments."
+
+#~ msgid "element"
+#~ msgid_plural "elements"
+#~ msgstr[0] "élément"
+#~ msgstr[1] "éléments"
+
+#~ msgid "Unknown annotation object {0} at line {1} column {2}"
+#~ msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
+
+#~ msgid "The base URL to the server retrieving WMS background pictures from."
+#~ msgstr "L'URL du serveur récupérant les images de l'arrière-plan WMS."
+
+#~ msgid "Landsat background images"
+#~ msgstr "Images satellites landsat"
+
+#~ msgid "WMS layer: {0}"
+#~ msgstr "calque WMS :{0}"
 
 #~ msgid "Download {0} ways containing a total of {1} segments?"
@@ -2129,7 +3461,4 @@
 #~ msgstr "Actualiser la liste de sÃÂÃÂ©lection"
 
-#~ msgid "Search for objects."
-#~ msgstr "Rechercher des objets"
-
 #~ msgid "Language"
 #~ msgstr "Langue"
@@ -2138,7 +3467,4 @@
 #~ msgstr "Conflits dans des objets disjoints"
 
-#~ msgid "Downloading {0} {1}"
-#~ msgstr "TÃÂÃÂ©lÃÂÃÂ©chargement {0} {1}"
-
 #~ msgid "Got more than one object when expecting only one."
 #~ msgstr "Plus de deux objets acquis alors qu'un seul ÃÂÃÂ©tait attendu."
@@ -2167,9 +3493,4 @@
 #~ msgid "OptionPane.cancelButtonText"
 #~ msgstr "OptionPane.cancelButtonText"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr ""
-#~ "Impossible d'ouvrir le rÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©pertoire des "
-#~ "prÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©fÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©rences : {0}"
 
 #~ msgid ""
Index: /applications/editors/josm/plugins/lang/keys.pot
===================================================================
--- /applications/editors/josm/plugins/lang/keys.pot	(revision 3651)
+++ /applications/editors/josm/plugins/lang/keys.pot	(revision 3652)
@@ -9,5 +9,5 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-08 00:59+0200\n"
+"POT-Creation-Date: 2007-07-21 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -61,5 +61,5 @@
 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:70
 #: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:168
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "node"
 msgid_plural "nodes"
@@ -69,5 +69,5 @@
 #: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:56
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "segment"
 msgid_plural "segments"
@@ -77,5 +77,5 @@
 #: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:170
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
 msgid "way"
 msgid_plural "ways"
@@ -123,4 +123,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:106
 msgid "unknown"
 msgstr ""
@@ -137,40 +138,36 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:230
+#: ../../core/src/org/openstreetmap/josm/Main.java:227
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:256
+#: ../../core/src/org/openstreetmap/josm/Main.java:255
 #, java-format
 msgid "Could not load plugin {0}."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:280
-msgid "unnamed"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/Main.java:317
+#: ../../core/src/org/openstreetmap/josm/Main.java:316
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:387
+#: ../../core/src/org/openstreetmap/josm/Main.java:386
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
+#: ../../core/src/org/openstreetmap/josm/Main.java:388
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr ""
+
 #: ../../core/src/org/openstreetmap/josm/Main.java:389
-msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/Main.java:390
 msgid "Unsaved Changes"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:402
+#: ../../core/src/org/openstreetmap/josm/Main.java:401
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:415
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -277,22 +274,10 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
 msgid "Save"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
 msgid "Save the current data."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occurred while saving."
 msgstr ""
 
@@ -311,32 +296,41 @@
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 #, java-format
+msgid "Zoom to {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
 msgid "Zoom the view to {0}."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:14
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
 msgid "New"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:14
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
 msgid "Create a new map."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:41
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
 msgid "Combine Way"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:41
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
 msgid "Combine several ways into one."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:90
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:91
 msgid "Enter values for all conflicts."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:100
 #, java-format
 msgid "Combine {0} ways"
@@ -344,5 +338,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:71
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
 msgid "Help"
 msgstr ""
@@ -369,9 +363,9 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
 msgid "Save as"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
 msgid "Save the current data to a new file."
 msgstr ""
@@ -407,31 +401,31 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
 msgid "Add node"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
 msgid "Add a new node to the map"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:133
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:142
 msgid "Add node into segment"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
 msgid "Add a node into an existing segment"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:158
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:167
 msgid "Add node and connect"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
 msgid "Add a node and connect it to the selected (previously added) node"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:84
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
 msgid "Can not add a node outside of the world."
 msgstr ""
@@ -453,19 +447,19 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add Way"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add a new way to the data."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:94
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:142
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
 msgid ""
 "Warning: This way is incomplete. Try to download it before adding segments."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:161
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -478,25 +472,25 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:161
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:167
+#: ../../core/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 ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:167
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:172
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:172
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -505,5 +499,5 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 msgid "Create new way"
 msgstr ""
@@ -512,10 +506,10 @@
 #: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:62
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:412
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
 #: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
@@ -577,5 +571,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
 msgstr ""
 
@@ -600,4 +594,8 @@
 msgstr ""
 
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
+msgid "Please select at least one task to download"
+msgstr ""
+
 #: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
 msgid "Reverse segments"
@@ -616,39 +614,17 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
 msgid "Overwrite"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
 msgid "Exit"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
 msgid "Exit the application."
 msgstr ""
@@ -716,5 +692,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:93
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:79
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
@@ -835,4 +811,38 @@
 #: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
 msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:59
+msgid "No document open so nothing to save."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "The document contains no data. Save anyway?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "Empty document"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid "Conflicts"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "CSV output not supported yet."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+msgid "Unknown file extension."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:108
+msgid "An error occurred while saving."
 msgstr ""
 
@@ -935,61 +945,59 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 #, java-format
 msgid "last change at {0}"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
 #, java-format
 msgid "Java Version {0}"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-msgid "Latest Version on JOSM homepage is"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "checking..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
 msgid "Homepage"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:97
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Bug Reports"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "News about JOSM"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:102
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:103
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
 msgid "Readme"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:104
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
 msgid "Revision"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:105
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
 msgid "Contribution"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:109
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
 msgid "About JOSM..."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 msgid "File could not be found."
 msgstr ""
@@ -1003,33 +1011,33 @@
 msgstr ""
 
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:67
+#: ../waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:70
+#: ../waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr ""
+
 #: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:81
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:104
 #, java-format
 msgid "Tracks from {0}"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
 #, java-format
 msgid "Markers from {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:93
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:96
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:103
-#: ../waypoints/src/WaypointOpenAction.java:59
-#, java-format
-msgid "Error while parsing {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
-#: ../waypoints/src/WaypointOpenAction.java:63
-#, java-format
-msgid "Could not read \"{0}\""
 msgstr ""
 
@@ -1043,5 +1051,4 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
 msgid "Data Layer"
 msgstr ""
@@ -1067,32 +1074,24 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:47
-#, java-format
-msgid ""
-"The plugin {0} threw 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."
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:61
+#, java-format
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+msgid "Should the plugin be disabled?"
 msgstr ""
 
 #: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, java-format
-msgid ""
-"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
-#, java-format
-msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
-msgid "Should the plugin be disabled?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
 msgid "Disable plugin"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -1100,5 +1099,5 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -1106,13 +1105,13 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
 msgid "Do nothing"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
 msgid "Report Bug"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 msgid ""
 "An unexpected exception occurred.\n"
@@ -1122,15 +1121,9 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:92
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
 msgid "Unexpected Exception"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:100
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
 msgid ""
 "Please send an email with the following information to josm@eigenheimstrasse."
@@ -1138,17 +1131,21 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:124
+msgid "The text has already been copied to your clipboard."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
 msgid "Ctrl-"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
 msgid "Alt-"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
 msgid "AltGr-"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
 msgid "Shift-"
 msgstr ""
@@ -1243,39 +1240,39 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:111
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:113
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:116
 msgid "Unknown version"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:129
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:145
 msgid "Found <seg> tag on non-way."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:132
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Incomplete segment with id=0"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:141
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
 msgid "NullPointerException, Possibly some missing tags."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:168
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
 msgid "Illegal object with id=0"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:176
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "Couldn't read time format \"{0}\"."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:204
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:220
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:284
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 msgid "Preparing data..."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:294
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
 msgid "Illformed Node id"
 msgstr ""
@@ -1316,9 +1313,9 @@
 
 #: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:52
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:36
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
 #: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:388
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
 #: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
@@ -1361,32 +1358,6 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Object"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:191
-msgid "Unknown type"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:244
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
-#, java-format
-msgid "Error parsing {0}: "
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:277
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:307
-msgid "Change Properties"
 msgstr ""
 
@@ -1403,4 +1374,9 @@
 #: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, java-format
+msgid "Converted from: {0}"
 msgstr ""
 
@@ -1498,14 +1474,14 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:194
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:335
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
 #, java-format
 msgid " ({0} deleted.)"
@@ -1647,12 +1623,12 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Key"
 msgstr ""
 
 #: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:119
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Value"
 msgstr ""
@@ -1677,18 +1653,18 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:68
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
 msgid "Layer"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:69
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
 #: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:398
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
 msgid "Edit"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
 #: ../osmarender/src/OsmarenderPlugin.java:98
 #: ../osmarender/src/OsmarenderPlugin.java:104
@@ -1696,66 +1672,22 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:72
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
 msgid "Files"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
 msgid "Connection"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
 msgid "Tools"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
 msgid "Zoom To"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:39
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:53
-msgid "Annotation preset source"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:51
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:402
-msgid "Please select the row to edit."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:66
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:338
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:416
-#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
-msgid "Please select the row to delete."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:75
-msgid ""
-"The sources (url or filename) of annotation preset definition files. See "
-"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:76
-msgid "Add a new annotation preset source to the list."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:77
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:427
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java:79
-msgid "Annotation preset sources"
 msgstr ""
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:28
 msgid "Projection method"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:133
-msgid "Plugins"
 msgstr ""
 
@@ -1785,5 +1717,5 @@
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:139
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
 msgid "Not implemented yet."
@@ -1798,10 +1730,10 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:160
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:186
 #, java-format
 msgid ""
@@ -1811,5 +1743,5 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
 msgid "Download missing plugins"
 msgstr ""
@@ -1825,4 +1757,19 @@
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:64
 msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
 msgstr ""
 
@@ -1874,5 +1821,9 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid ""
 "If your gps device draw too few lines, select this to draw lines along your "
@@ -1880,23 +1831,27 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Draw direction hints for all segments."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
@@ -1929,4 +1884,28 @@
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:78
 msgid "You have to restart JOSM for some settings to take effect."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:53
+msgid "Tagging preset source"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+msgid ""
+"The sources (url or filename) of tagging preset definition files. See http://"
+"josm.eigenheimstrasse.de/wiki/TaggingPresets for help."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+msgid "Add a new tagging preset source to the list."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+msgid "Tagging preset sources"
 msgstr ""
 
@@ -2005,35 +1984,61 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:109
 #: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Java OpenStreetMap - Editor"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:147
 msgid "layer not in list."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
 msgid "Getting Started"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
 msgid "[Download] some data from the OSM server"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
 msgid "Getting Help"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:68
 msgid "Open the [online help] (english only)"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 msgid "Watch some [tutorial videos]"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
 msgid "Join the newbie [mailing list]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:191
+msgid "Unknown type"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:241
+#, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:244
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
+#, java-format
+msgid "Error parsing {0}: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:277
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:307
+msgid "Change Properties"
 msgstr ""
 
@@ -2096,33 +2101,33 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
 msgid "Click Reload to refresh list"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
 msgid "Reload"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
 msgid "Revert"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
 msgid "History"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
 msgid "Display the history of all selected items."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Date"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
 msgid "Reload all currently selected objects and refresh the list."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:141
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:142
 msgid ""
 "Revert the state of all currently selected objects to the version selected "
@@ -2138,95 +2143,95 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Show/Hide"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
 msgid "Show/Hide Text"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
 msgid "Toggle visible state of the marker text."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
 msgid "Layers"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
 msgid "Open a list of all loaded layers."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:219
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:221
 msgid "Move the selected layer one row up."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:227
 msgid "Move the selected layer one row down."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:241
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
 msgid "Conflict"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
 msgid "Merging conflicts."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Resolve"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
 msgid "Select"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:109
 msgid "Please select something from the conflict list."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
 msgid "Resolve Conflicts"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
 msgid "Authors"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
 msgid "Open a list of people working on the selected objects."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
 msgid "Author"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
 msgid "# Objects"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:105
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
 #, java-format
 msgid "This will change {0} object."
@@ -2235,20 +2240,20 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:105
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
 msgid "An empty value deletes the key."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:129
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
 msgid "Change values?"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:393
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:394
 msgid "<different>"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:160
 #, java-format
 msgid "Change properties of {0} object"
@@ -2257,33 +2262,33 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
 msgid "Please select objects for which you want to change properties."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
 msgid "Please select a key"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
 msgid "Please select a value"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:277
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
 msgid "Properties"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:277
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
 msgid "Properties for selected objects."
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
 msgid "Delete the selected key in all objects"
 msgstr ""
@@ -2297,9 +2302,9 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:48
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
 msgid "Current Selection"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:48
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
 msgid "Open a selection list window."
 msgstr ""
@@ -2365,9 +2370,9 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:75
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:74
 msgid "Data Sources and Types"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:106
 msgid "Download Area"
 msgstr ""
@@ -2485,4 +2490,17 @@
 msgstr ""
 
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:34
+#, java-format
+msgid ""
+"Do you want to load a basic tagging preset for your language ({0})?\n"
+"This is recommend for beginners of JOSM.\n"
+"\n"
+"'Cancel' will ask this question on next start again."
+msgstr ""
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:35
+msgid "Language Plugin detected"
+msgstr ""
+
 #: ../osmarender/src/OsmarenderPlugin.java:86
 msgid "FireFox not found. Please set firefox executable in the preferences."
@@ -2509,45 +2527,45 @@
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:79
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
 msgid "Add Site"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:82
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
 msgid "Update Site Url"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:93
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
 msgid "Invalid Url"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:100
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
 msgid "Delete Site(s)"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:104
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
 msgid "Please select the site to delete."
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:115
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
 msgid "Check Site(s)"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:119
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
 msgid "Please select the site(s) to check for updates."
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:143
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
 msgid "Add a new plugin site."
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:144
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
 msgid "Delete the selected site(s) from the list."
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:145
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
 msgid "Check the selected site(s) for new plugins or updates."
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:147
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
 msgid "Update Sites"
 msgstr ""
@@ -2586,4 +2604,5 @@
 
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
 #, java-format
 msgid "Version: {0}<br>Last change at {1}"
@@ -2708,5 +2727,5 @@
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:179
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:178
 #, java-format
 msgid ""
@@ -2715,34 +2734,34 @@
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:242
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:241
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:247
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:246
 msgid "Invalid property keys"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:255
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:254
 msgid "Unknown property values"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:263
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:262
 msgid "FIXMES"
 msgstr ""
 
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:370
+msgid "Check property keys."
+msgstr ""
+
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:371
-msgid "Check property keys."
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:372
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:391
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:404
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:403
 msgid "Spellcheck source"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:423
 msgid ""
 "The sources (url or filename) of spell check data files. See http://wiki."
@@ -2750,29 +2769,29 @@
 msgstr ""
 
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+msgid "Add a new spellcheck source to the list."
+msgstr ""
+
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:425
-msgid "Add a new spellcheck source to the list."
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:429
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:428
 msgid "Spellcheck data sources"
 msgstr ""
 
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:450
+msgid "Check property values."
+msgstr ""
+
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:451
-msgid "Check property values."
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:452
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:459
+msgid "Check for FIXMES."
+msgstr ""
+
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:460
-msgid "Check for FIXMES."
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:461
 msgid "Looks for nodes, segments or ways with FIXME in any property value."
 msgstr ""
@@ -2855,5 +2874,5 @@
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:37
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
 msgid ""
 "<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
@@ -2863,5 +2882,5 @@
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:40
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
 msgid ""
 "<html>The port that the server will use to listen WMS requests<br>The WMS "
@@ -2869,5 +2888,5 @@
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:42
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
 msgid ""
 "<html>Name of the profile.<br>This profile is used to avoid nag firefox "
@@ -2878,37 +2897,41 @@
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:48
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:48
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Settings for the Yahoo! imagery server."
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:49
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
 msgid "YWMS options"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:51
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
 msgid "Firefox executable"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:54
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
 msgid "Firefox profile"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
 msgid "Create"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:60
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
 msgid "Server port"
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:124
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
 msgid "Please name the profile you want to create."
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:130
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
 msgid "Creating profile"
 msgstr ""
@@ -2942,18 +2965,4 @@
 msgstr ""
 
-#: ../annotation-tester/src/org/openstreetmap/josm/plugins/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr ""
-
-#: ../annotation-tester/src/org/openstreetmap/josm/plugins/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr ""
-
-#: ../annotation-tester/src/org/openstreetmap/josm/plugins/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
@@ -2969,17 +2978,17 @@
 msgstr ""
 
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:48
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:49
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:50
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin"
 msgstr ""
@@ -3039,4 +3048,17 @@
 msgstr ""
 
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+msgid "Tagging Preset Tester"
+msgstr ""
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr ""
+
 #: ../namefinder/namefinder/PlaceSelection.java:39
 msgid "Search..."
Index: /applications/editors/josm/plugins/lang/ro/ro.po
===================================================================
--- /applications/editors/josm/plugins/lang/ro/ro.po	(revision 3651)
+++ /applications/editors/josm/plugins/lang/ro/ro.po	(revision 3652)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-22 21:32+0200\n"
+"POT-Creation-Date: 2007-07-21 14:05+0200\n"
 "PO-Revision-Date: 2006-10-14 10:09+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -21,111 +21,474 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
-msgid "Add segment"
-msgstr "Adaugă segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
-msgid "Add a segment between two nodes."
-msgstr "Adaugă un segment între două noduri."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-msgid "Delete"
-msgstr "Şterge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr "Şterge noduri, străzi sau segmente."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr "Nu pot şterge nodul."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr "Acest obiect este în uz."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr "Folosit de mai mult de două segmente."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr "Folosit de un singur segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr "Direcţie greşită a segmentelor."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr "Chei în conflict"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr "Segmentele sunt părţi din căi diferite."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr "Şterge nod"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom"
-msgstr "Apropie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-msgstr "Apropie prin tragere. (Ctrl-sus,stânda,jos,dreapta,+,-)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "de la"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "la"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "nici unul"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "segmente"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "poziţie"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "diferit"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "şters"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "adevărat"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "fals"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:183
+msgid "background"
+msgstr "fundal"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:184
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:70
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "nod"
+msgstr[1] "noduri"
+msgstr[2] "de noduri"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "segment"
+msgstr[1] "segmente"
+msgstr[2] "de segmente"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "cale"
+msgstr[1] "căi"
+msgstr[2] "de căi"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+msgid "incomplete way"
+msgstr "cale incompletă"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+msgid "selected"
+msgstr "selectat"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+msgid "gps point"
+msgstr "punct gps"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "conflict"
+msgstr "conflict"
+
+#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+msgid "scale"
+msgstr "scală"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#, fuzzy, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferinţe"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
+#, fuzzy, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nu am putut încărca modulul {0}"
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+msgid "new"
+msgstr "nou"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:106
+msgid "unknown"
+msgstr "necunoscut"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:91
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} nod"
+msgstr[1] "{0} noduri"
+msgstr[2] "{0} de noduri"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:94
+msgid "incomplete"
+msgstr "incomplet"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:227
+#, java-format
+msgid "Plugin not found: {0}."
+msgstr "Modulul nu a fost găsit: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:255
+#, java-format
+msgid "Could not load plugin {0}."
+msgstr "Nu am putut încărca modulul {0}"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:316
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr "Proiecţia nu a putut fi citită din preferinte. Folosesc EPSG:4263."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:386
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la "
+"server."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:388
+#, fuzzy
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr "Există modificăre nesalvate. Într-adevăr ieşiţi?"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:389
+msgid "Unsaved Changes"
+msgstr "Modificări nesalvate"
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:401
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignor adresa malformată: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignor adresa malformată către fişier: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload to OSM"
+msgstr "Transmite la OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload all changes to the OSM server."
+msgstr "Trimite toate schimbările la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Objects to add:"
+msgstr "Obiecte de adăugat:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+msgid "Objects to modify:"
+msgstr "Obiecte de modificat:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+msgid "Objects to delete:"
+msgstr "Obiecte de şters:"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
+#, fuzzy
+msgid "Upload these changes?"
+msgstr "Transmit aceste schimbări?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Nothing to upload. Get some data first."
+msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
+msgid "No changes to upload."
+msgstr "Nu sunt schimbări de transmis."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
+msgid "Uploading data"
+msgstr "Transmit datele"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
+msgid "Rename layer"
+msgstr "Redenumire strat"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Şi redenumeşte şi fişierul"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Nu am putut redenumi fişierul \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect All"
+msgstr "selectat"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:13
+#, fuzzy
+msgid "Unselect all objects."
+msgstr "Şterge cheia selectată din toate obiectele"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
+#, fuzzy
+msgid "Align Nodes in Line"
+msgstr "Aliniază noduri în cerc"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#, fuzzy
+msgid "Move the selected nodes onto a line."
+msgstr "Mută nodurile selectate într-un cerc."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
+#, fuzzy
+msgid "Please select at least three nodes."
+msgstr "Vă rog selectaţi cel puţin petru noduri."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fişiere server OSM (.osm .xml)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#, fuzzy
+msgid "GPX Files (.gpx .gpx.gz)"
+msgstr "Fişiere GPX (.gpx)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fişiere CSV (.csv .txt)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr "Aliniază noduri în cerc"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr "Mută nodurile selectate într-un cerc."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
+msgstr "Vă rog selectaţi cel puţin petru noduri."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save"
+msgstr "Salvează"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save the current data."
+msgstr "Salvează datele curente."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
+msgid "data"
+msgstr "date"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
+msgid "selection"
+msgstr "selecţie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
+msgid "layer"
+msgstr "strat"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom to {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "New"
+msgstr "nou"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+#, fuzzy
+msgid "Create a new map."
+msgstr "Crează o nouă cale"
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr "fără nume"
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:42
+msgid "Combine several ways into one."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#, fuzzy
+msgid "Please select at least two ways to combine."
+msgstr "Vă rog selectaţi cel puţin un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:91
+msgid "Enter values for all conflicts."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:100
+#, java-format
+msgid "Combine {0} ways"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+msgid "Help"
+msgstr "Ajutor"
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "Se pot edita doar paginile din ajutorul JOSM online"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
+msgid "Preferences"
+msgstr "Preferinţe"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+msgid "Open a preferences page for global settings."
+msgstr "Deschide o pagină de preferinţe pentru opţiunile globale"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refă"
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refă ultima acţiune anulată."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save as"
+msgstr "Salvează ca"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save the current data to a new file."
+msgstr "Salvează datele curente într-un fişier nou."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+#, fuzzy
+msgid "Reorder Segments"
+msgstr "Inversează segmentele"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+msgid ""
+"Try to reorder segments of a way so that they are in a line. May try to flip "
+"segments around to match a line."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:41
+#, fuzzy
+msgid "Please select at least one way."
+msgstr "Vă rog selectaţi cel puţin un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
+#, fuzzy
+msgid "Reorder segments"
+msgstr "Reordonez toate segmentele de dreaptă?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
+#, fuzzy
+msgid "The selected way is incomplete or has only one segment."
+msgid_plural ""
+"None of the selected ways are complete and have more than one segment."
+msgstr[0] "Vă rog selectaţi cel puţin un segment."
+msgstr[1] "Vă rog selectaţi cel puţin un segment."
+msgstr[2] "Vă rog selectaţi cel puţin un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
+#, fuzzy, java-format
+msgid "Reorder segments for way {0}"
+msgstr "Adaugă segmente din căi"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add node"
+msgstr "Adaugă nod"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add a new node to the map"
+msgstr "Adaugă un nod pe hartă"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:142
+msgid "Add node into segment"
+msgstr "Adaugă un nod la segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+msgid "Add a node into an existing segment"
+msgstr "Adaugă un nod la un segment existent"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:167
+#, fuzzy
+msgid "Add node and connect"
+msgstr "Adaugă un nod la segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+msgid "Add a node and connect it to the selected (previously added) node"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
+msgid "Can not add a node outside of the world."
+msgstr "Nu pot adăuga un nod în afara lumii."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Selecţie"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects by dragging or clicking."
 msgstr "Selectează obiecte prin tragere sau clic."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Linie dreaptă"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Select objects in a straight line."
 msgstr "Selectează obiectele din o linie dreaptă."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Mută"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr "Mută obiectele care sunt sub mouse sau selectate."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr "Nu pot muta obiecte în afara lumii."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add Way"
 msgstr "Adaugă cale"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:62
 msgid "Add a new way to the data."
 msgstr "Adaugă o nouă cale datelor."
 
-#: ../../../../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."
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#, fuzzy
+msgid ""
+"Warning: This way is incomplete. Try to download it before adding segments."
 msgstr ""
 "Atentie: Această cale este incompletă. Încercaţi să o descărcaţi înainte de "
 "a adăuga segmente."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -145,25 +508,25 @@
 "Doriţi în schimb să selectaţi toate segmentele aparţinând căilor?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Adaugă segmente din căi"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/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 "Doriţi să adăugaţi toate celelalte segmente selectate căii selectate?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Adaug segmente căii?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Reordonez toate segmentele de dreaptă?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Reordonez?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -173,684 +536,305 @@
 msgstr[2] "Crează o cale nouă din {0} de segmente?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:203
 msgid "Create new way"
 msgstr "Crează o nouă cale"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add node"
-msgstr "Adaugă nod"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add a new node to the map"
-msgstr "Adaugă un nod pe hartă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add node into segment"
-msgstr "Adaugă un nod la segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add a node into an existing segment"
-msgstr "Adaugă un nod la un segment existent"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
-msgid "Can not add a node outside of the world."
-msgstr "Nu pot adăuga un nod în afara lumii."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
-msgid "Add Node into Segment"
-msgstr "Adaugă nod în segment"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr "Date GPS neprelucrate"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Descarc date GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr "Date OpenStreetMap"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:21
-msgid "Downloading data"
-msgstr "Descarc date"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Nu au fost importate date."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Strat de date"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+msgid "Delete"
+msgstr "Şterge"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr "Şterge noduri, străzi sau segmente."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr "Nu pot şterge nodul."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr "Acest obiect este în uz."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr "Folosit de mai mult de două segmente."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr "Folosit de un singur segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Direcţie greşită a segmentelor."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Chei în conflict"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr "Segmentele sunt părţi din căi diferite."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
+msgstr "Şterge nod"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Mută"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr "Mută obiectele care sunt sub mouse sau selectate."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
+msgstr "Nu pot muta obiecte în afara lumii."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Apropie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#, fuzzy
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
+msgstr "Apropie prin tragere. (Ctrl-sus,stânda,jos,dreapta,+,-)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+msgid "Add segment"
+msgstr "Adaugă segment"
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+msgid "Add a segment between two nodes."
+msgstr "Adaugă un segment între două noduri."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download from OSM"
+msgstr "Descarcă de la OSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download map data from the OSM server."
+msgstr "Descarcă hărţi de la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
+#, fuzzy
+msgid "Download"
+msgstr "Descarc?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
+#, fuzzy
+msgid "Please select at least one task to download"
+msgstr "Vă rog selectaţi cel puţin un tip de date de descărcat."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse segments"
+msgstr "Inversează segmentele"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
+#, fuzzy
+msgid "Reverse the direction of all selected Segments."
+msgstr "Inversează direcţia tuturor segmentelor selectate."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:44
+msgid "Please select at least one segment."
+msgstr "Vă rog selectaţi cel puţin un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:55
 msgid "Reverse Segments"
 msgstr "Inversează segmentele"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-msgid "Revert the direction of all selected Segments."
-msgstr "Inversează direcţia tuturor segmentelor selectate."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
-msgid "Please select at least one segment."
-msgstr "Vă rog selectaţi cel puţin un segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
-msgid "Preferences"
-msgstr "Preferinţe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-msgid "Open a preferences page for global settings."
-msgstr "Deschide o pagină de preferinţe pentru opţiunile globale"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open"
-msgstr "Deschide"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open a file."
-msgstr "Deschide un fişier."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr "Importul CSV Data pentru date non-GPS nu este încă implementat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Extensie fişier necunoscută : {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:59
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Eroare la prelucrarea {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:63
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Nu am putut citi \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr "Execut {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr "Această unealtă necesită să fie încărcate nişte date."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr "Nu am putut executa comanda: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr "Unelte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-msgstr "Nu am putut citi configuraţia uneltei externe."
-
-#: ../../../../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 "Aliniază noduri în cerc"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr "Mută nodurile selectate într-un cerc."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-msgstr "Vă rog selectaţi cel puţin petru noduri."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr "Redenumire strat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Şi redenumeşte şi fişierul"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Nu am putut redenumi fişierul \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "File exists. Overwrite?"
+msgstr "Fişierul există. Îl suprascriu?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
+msgid "Overwrite"
+msgstr "Suprascrie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit"
+msgstr "Ieşire"
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit the application."
+msgstr "Părăsiţi aplicaţia."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+#, fuzzy
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Notă: GPL nu este compatibilă cu licenţa OSM. Nu transmiteţi piste "
+"licenţiate GPL"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Exportă GPX"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Exportă datele într-un fişier GPX."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "descrierea pistei gps"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Adaugă informaţii despre autor"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Nume real"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "Email"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Drepturi de autor (adresă)"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Predefinit"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "An drepturi de autor"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Cuvinte cheie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Opţiuni exportare"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:78
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:62
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Eroare la exportarea {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:79
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+msgid "Error"
+msgstr "Eroare"
+
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Alegeţi o licenţă predefinită"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Anulează"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Anulează ultima acţiune."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download from OSM"
-msgstr "Descarcă de la OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download map data from the OSM server."
-msgstr "Descarcă hărţi de la serverul OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
-msgid ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-msgstr ""
-"Mută şi măreşte imaginea ca şi harta principală. Selectaţi prin tragere zona "
-"ce va fi descărcată."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
-msgid "Bounding box"
-msgstr "Perimetru selectat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
-msgid "min lat"
-msgstr "min lat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
-msgid "min lon"
-msgstr "min lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
-msgid "max lat"
-msgstr "max lat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
-msgid "max lon"
-msgstr "max lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-msgid "Download the following data:"
-msgstr "Descarc următoarele date:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
-msgid "URL from www.openstreetmap.org"
-msgstr "Adresa de la www.openstreetmap.org"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
-msgid "Bookmarks"
-msgstr "Semne de carte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
-msgid "Add"
-msgstr "Adaugă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
-msgid "Please enter the desired coordinates first."
-msgstr "Vă rog întâi introduceţi coordonatele dorite."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
-msgid "Please enter a name for the location."
-msgstr "Vă rog introduceţi un nume pentru locaţie."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
-msgid "Remove"
-msgstr "Elimină"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
-msgid "Select a bookmark first."
-msgstr "Selectaţi întâi un semn de carte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
-msgid "Choose an area"
-msgstr "Alegeţi o zonă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
-msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr ""
-"Vă rog introduceţi coordonetele dorite sau faceţi clic pe un semn de carte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-msgid "Please select at least one download data type."
-msgstr "Vă rog selectaţi cel puţin un tip de date de descărcat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit"
-msgstr "Ieşire"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit the application."
-msgstr "Părăsiţi aplicaţia."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "About"
-msgstr "Despre"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "Display the about screen."
-msgstr "Afişează ecranul cu informaţii despre program."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
-#, java-format
-msgid "Java OpenStreetMap Editor Version {0}"
-msgstr "Java OpenStreetMap Editor Versiunea {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#, java-format
-msgid "last change at {0}"
-msgstr "ultima modificare la {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, java-format
-msgid "Java Version {0}"
-msgstr "Java Versiunea {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
-msgid "Homepage"
-msgstr "Pagina pricipală"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
-msgid "Bug Reports"
-msgstr "Rapoarte erori"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "News about JOSM"
-msgstr "Ştiri despre JOSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
-msgid "Info"
-msgstr "Informaţii"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "Readme"
-msgstr "Citeşte-mă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
-msgid "Revision"
-msgstr "Revizia"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-msgid "Contribution"
-msgstr "Contribuţii"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
-msgid "About JOSM..."
-msgstr "Despre JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
-msgid "File could not be found."
-msgstr "Fişierul nu a putut fi găsit."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr "Nu este nici un document deschis, nu este nimic de salvat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr "Acest document nu conţine date. Salvez oricum?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr "Document gol"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Există conflicte nerezolvate. Conflictele nu vor fi salvate şi se vor trata "
-"ca şi cum aţi refuzat totul. Continui?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr "Conflicte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "File exists. Overwrite?"
-msgstr "Fişierul există. Îl suprascriu?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "Overwrite"
-msgstr "Suprascrie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-msgid "data"
-msgstr "date"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-msgid "selection"
-msgstr "selecţie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
-msgid "layer"
-msgstr "strat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
-msgid "conflict"
-msgstr "conflict"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
-#, java-format
-msgid "Auto Scale: {0}"
-msgstr "Scalare automată: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
-#, java-format
-msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
-msgstr ""
-"Mărire automată pentru a vizualiza (la {0}. Dezactivat dacă vizualizarea "
-"este mutată)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Salvează ca"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Salvează datele curente într-un fişier nou."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "Fişiere server OSM (.osm .xml)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "Fişiere GPX (.gpx)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "Fişiere CSV (.csv .txt)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload to OSM"
-msgstr "Transmite la OSM"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload all changes to the OSM server."
-msgstr "Trimite toate schimbările la serverul OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
-msgid "Nothing to upload. Get some data first."
-msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Uploading data"
-msgstr "Transmit datele"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
-msgid "No changes to upload."
-msgstr "Nu sunt schimbări de transmis."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Objects to add:"
-msgstr "Obiecte de adăugat:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
-msgid "Objects to modify:"
-msgstr "Obiecte de modificat:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
-msgid "Objects to delete:"
-msgstr "Obiecte de şters:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
-msgid "Upload this changes?"
-msgstr "Transmit aceste schimbări?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:54
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr "Ajutor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:106
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Se pot edita doar paginile din ajutorul JOSM online"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, java-format
-msgid "Downloading {0} segment"
-msgid_plural "Downloading {0} segments"
-msgstr[0] "Descarc {0} segment"
-msgstr[1] "Descarc {0} segmente"
-msgstr[2] "Descarc {0} de segmente"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+#, fuzzy
+msgid "Select All"
+msgstr "Selectaţi"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:13
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
+#, fuzzy, java-format
+msgid "Downloading {0} way"
+msgid_plural "Downloading {0} ways"
+msgstr[0] "Descarc {0} {1}"
+msgstr[1] "Descarc {0} {1}"
+msgstr[2] "Descarc {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download incomplete objects"
 msgstr "Descarcă obiecte incomplete"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr "Descarcă toate căile incomplete (selectate) de pe serverul OSM."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
 msgid "Please select an incomplete way."
 msgstr "Vă rog selectaţi o cale incompletă."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 #, java-format
 msgid "Download {0} incomplete ways?"
 msgstr "Descarc {0} căi incomplete?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
 msgid "Download?"
 msgstr "Descarc?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Refă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refă ultima acţiune anulată."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Notă: GPL nu este compatibilă cu licenţa OSM. Nu transmiteţi piste "
-"licenţiate GPL"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Exportă GPX"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Exportă datele într-un fişier GPX."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "descrierea pistei gps"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Adaugă informaţii despre autor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Nume real"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "Email"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Drepturi de autor (adresă)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Predefinit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "An drepturi de autor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Cuvinte cheie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Opţiuni exportare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Eroare la exportarea {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Eroare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Alegeţi o licenţă predefinită"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr "Salvează"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr "Salvează datele curente."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr "Formatul CSV nu este încă suportat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr "Extensie fişier necunoscută."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr "A intervenit o eroare în timpul salvării."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
-#, java-format
-msgid ""
-"The plugin {0} throwed an exception: {1}\n"
-"It may be outdated. Please contact the plugin's autor.\n"
-"This message will not shown again until JOSM is restarted."
-msgstr ""
-"Modulul {0} a generat o excepţie: {1}\n"
-"Ar putea să fie învechit. Vă rog contactaţi autorul modulului.\n"
-"Acest mesaj nu va fi arătat din nou până nu se reporneşte JOSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Do nothing"
-msgstr "Nu fă nimic"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Raportează eroarea"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occoured.\n"
-"\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."
-msgstr ""
-"A avut loc o excepţie netratată.\n"
-"\n"
-"Aceasta este întotdeauna o eroare de programare. Dacă rulaţi ultima\n"
-"versiune de JOSM, vă rog fiţi amabil şi trimiteţi un raport de eroare."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Excepţie netratată"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-"Vă rog trimiteţi asta la josm@eigenhaimstrasse.de\n"
-"\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-"Vă rog trimiteţi un email cu următoarele informaţii la josm@eigenheimstrasse."
-"de"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
-msgid "Ctrl-"
-msgstr "Ctrl-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
-msgid "Alt-"
-msgstr "Alt-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
-msgid "AltGr-"
-msgstr "AltGr-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "Shift-"
-msgstr "Shift-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "A intervenit o eroare în modulul {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
 msgid "Load Selection"
 msgstr "Încarcă selecţia"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contactez {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
 msgid "Downloading..."
 msgstr "Descarc..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Nu am putut citi de la adresa: \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Eroare de prelucrare la adresa: \"{0}\""
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Current Selection"
-msgstr "Selecţia curentă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Open a selection list window."
-msgstr "Deschide o fereastra cu o listă de selecţie."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "Search"
+msgstr "Căutare"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+msgid "Search for objects."
+msgstr "Caută obiecte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
+#, fuzzy
+msgid "No data loaded."
+msgstr "Nu au fost importate date."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
 msgid "Please enter a search string."
 msgstr "Vă rog introduceţi un şir de căutat"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -867,338 +851,627 @@
 "foot are orice valoare.</ul></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 msgid "replace selection"
 msgstr "Înlocuieşte selecţia"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "add to selection"
 msgstr "adaugă la selecţie"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "remove from selection"
 msgstr "elimină din selecţie"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
-msgid "Search"
-msgstr "Căutare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Conflict"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Îmbin conflictele."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Rezolvă"
-
-#: ../../../../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 ""
-"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de "
-"mai sus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr "Selectaţi"
-
-#: ../../../../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."
-msgstr ""
-"Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
-"mai sus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
-msgid "Please select something from the conflict list."
-msgstr "Vă rog selectaţi ceva din lista de conflicte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-msgid "Resolve Conflicts"
-msgstr "Rezolvare conflicte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Reîncarcă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Anulează"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Istoric"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Afişează istoricul tuturor elementelor selectate."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:59
+msgid "No document open so nothing to save."
+msgstr "Nu este nici un document deschis, nu este nimic de salvat."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "The document contains no data. Save anyway?"
+msgstr "Acest document nu conţine date. Salvez oricum?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:62
+msgid "Empty document"
+msgstr "Document gol"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Există conflicte nerezolvate. Conflictele nu vor fi salvate şi se vor trata "
+"ca şi cum aţi refuzat totul. Continui?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+msgid "Conflicts"
+msgstr "Conflicte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "CSV output not supported yet."
+msgstr "Formatul CSV nu este încă suportat."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+msgid "Unknown file extension."
+msgstr "Extensie fişier necunoscută."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:108
+#, fuzzy
+msgid "An error occurred while saving."
+msgstr "A intervenit o eroare în timpul salvării."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+msgid "Split Way"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:101
+#, fuzzy
+msgid "Split a way at the selected node."
+msgstr "Şterge stratul selectat."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgid "The current selection cannot be used for splitting."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:160
+#, fuzzy
+msgid "The selected node is not part of any way."
+msgid_plural "The selected nodes are not part of any way."
+msgstr[0] "Mută nodurile selectate într-un cerc."
+msgstr[1] "Mută nodurile selectate într-un cerc."
+msgstr[2] "Mută nodurile selectate într-un cerc."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+msgid ""
+"There is more than one way using the node(s) you selected. Please select the "
+"way also."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:176
+#, fuzzy
+msgid "The selected nodes do not share the same way."
+msgstr "Mută nodurile selectate într-un cerc."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:190
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:210
+msgid "The selected segment is not part of any way."
+msgid_plural "The selected segments are not part of any way."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+msgid ""
+"There is more than one way using the segment you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the segments you selected. Please select "
+"the way also."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:228
+msgid "The selected segments do not share the same way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#, fuzzy
+msgid "The selected way does not contain the selected segment."
+msgid_plural "The selected way does not contain all the selected segments."
+msgstr[0] "Vă rog selectaţi cel puţin un segment."
+msgstr[1] "Vă rog selectaţi cel puţin un segment."
+msgstr[2] "Vă rog selectaţi cel puţin un segment."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:245
+#, fuzzy
+msgid "Warning: This way is incomplete. Try to download it before splitting."
+msgstr ""
+"Atentie: Această cale este incompletă. Încercaţi să o descărcaţi înainte de "
+"a adăuga segmente."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:360
+msgid "The selected segments are not in the same contiguous part of the way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:373
+msgid ""
+"Removing the selected segments would make a part of the way non-contiguous."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:410
+msgid ""
+"The way cannot be split at the selected node. (Hint: To split circular ways, "
+"select two nodes.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:412
+msgid ""
+"The way cannot be split because it is contiguous. (Hint: To split at a node, "
+"select that node.)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "About"
+msgstr "Despre"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Display the about screen."
+msgstr "Afişează ecranul cu informaţii despre program."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Versiunea {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#, java-format
+msgid "last change at {0}"
+msgstr "ultima modificare la {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java Versiunea {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
+msgid "Homepage"
+msgstr "Pagina pricipală"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Bug Reports"
+msgstr "Rapoarte erori"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "News about JOSM"
+msgstr "Ştiri despre JOSM"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Informaţii"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
+msgid "Readme"
+msgstr "Citeşte-mă"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
+msgid "Revision"
+msgstr "Revizia"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
+msgid "Contribution"
+msgstr "Contribuţii"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Module"
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+msgid "About JOSM..."
+msgstr "Despre JOSM..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "File could not be found."
+msgstr "Fişierul nu a putut fi găsit."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open"
+msgstr "Deschide"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open a file."
+msgstr "Deschide un fişier."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:67
+#: ../waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Eroare la prelucrarea {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:70
+#: ../waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nu am putut citi \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:81
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr "Importul CSV Data pentru date non-GPS nu este încă implementat."
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Extensie fişier necunoscută : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:104
+#, fuzzy, java-format
+msgid "Tracks from {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:106
+#, fuzzy, java-format
+msgid "Markers from {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:29
+msgid "Downloading data"
+msgstr "Descarc date"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:41
+msgid "No data imported."
+msgstr "Nu au fost importate date."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
+msgid "Data Layer"
+msgstr "Strat de date"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:50
+msgid "OpenStreetMap data"
+msgstr "Date OpenStreetMap"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:27
+msgid "Downloading GPS data"
+msgstr "Descarc date GPS"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Raw GPS data"
+msgstr "Date GPS neprelucrate"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:23
+#, fuzzy
+msgid "Do not show again"
+msgstr "Nu fă nimic"
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
+#, fuzzy
+msgid "Information"
+msgstr "Adaugă informaţii despre autor"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:61
+#, java-format
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+msgid "Should the plugin be disabled?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+msgid "Disable plugin"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+msgid ""
+"The plugin could not be removed. Please tell the people you got JOSM from "
+"about the problem."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Do nothing"
+msgstr "Nu fă nimic"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Report Bug"
+msgstr "Raportează eroarea"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+msgstr ""
+"A avut loc o excepţie netratată.\n"
+"\n"
+"Aceasta este întotdeauna o eroare de programare. Dacă rulaţi ultima\n"
+"versiune de JOSM, vă rog fiţi amabil şi trimiteţi un raport de eroare."
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+msgid "Unexpected Exception"
+msgstr "Excepţie netratată"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Vă rog trimiteţi un email cu următoarele informaţii la josm@eigenheimstrasse."
+"de"
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:124
+msgid "The text has already been copied to your clipboard."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Ctrl-"
+msgstr "Ctrl-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "Alt-"
+msgstr "Alt-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
+msgid "Shift-"
+msgstr "Shift-"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
+#, fuzzy
+msgid "Downloading incomplete ways..."
+msgstr "Descarc {0} căi incomplete?"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
+msgid "Fix data errors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
+#, fuzzy, java-format
+msgid "Segment {0} is deleted but part of Way {1}"
+msgstr "Eroare de date: Segmentul {0} a fost sterş dar este parte a căii {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
+#, fuzzy
+msgid "Data error"
+msgstr "Strat de date"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr "Eroare de date: Segmentul {0} a fost sterş dar este parte a căii {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+"Eroare de date: Nodul {0} a fost şters dar este parte a segmentului {1}"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
+#, fuzzy, java-format
+msgid "Data error: lat value \"{0}\" is out of bounds."
+msgstr "Eroare date: valoarea lat \"{0}\" este în afara limitelor."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
+#, fuzzy, java-format
+msgid "Data error: lon value \"{0}\" is out of bounds."
+msgstr "Eroare date: valoarea lon \"{0}\" este în afara limitelor."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Transmit {0} {1} ({2})..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+msgid "Unknown host"
+msgstr "Gazdă necunoscută"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Nu am putut detecta şirul de format al datelor."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#, fuzzy
+msgid ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in preferences."
+msgstr ""
+"Şirul de format al datelor este incomplet sau nu a putut fi găsit. Încercaţi "
+"să precizaţi manual un şir de format în Preferinţe."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+"Şirul de format este incomplet. E necesar să fie specificate cel puţin 'lat' "
+"şi 'lon'"
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Tip de date necunoscut: \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, fuzzy
+msgid "Maybe add a format string in preferences."
+msgstr "Puteţi să adăugaţi un şir de format în preferinţe."
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Eroare de prelucrare la linia {0}"
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
+#, fuzzy
+msgid "Contacting OSM Server..."
+msgstr "Contactez serverul OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Descarc punctele {0} până la {1}..."
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+msgid "Downloading OSM data..."
+msgstr "Descarc datele OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:116
+msgid "Unknown version"
+msgstr "Versiune necunoscută"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:145
+msgid "Found <seg> tag on non-way."
+msgstr "Am găsit eticheta <seg> pe o non-cale."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
+msgid "Incomplete segment with id=0"
+msgstr "Segment incomplet cu id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
+#, fuzzy
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "Excepţie pointer nul. Posibil lipsesc nişte etichete."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+msgid "Illegal object with id=0"
+msgstr "Obiect ilegal cu id=0"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#, fuzzy
+msgid "Couldn't read time format \"{0}\"."
+msgstr "Nu am putut citi formatul de timp \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:220
+#, fuzzy, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr "Lipseşte atributul necesar \"{0}\"."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+msgid "Preparing data..."
+msgstr "Pregătesc datele..."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+msgid "Illformed Node id"
+msgstr "Note id malformat"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Eroare la prelucrare."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Parolă sau nume utilizator incorecte."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
+msgid "Username"
+msgstr "Nume utilizator"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+msgid "Password"
+msgstr "Parolă"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Atenţie: Parola este transferată necriptată."
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
+msgid "Save user and password (unencrypted)"
+msgstr "Salvează nume utilizator şi parolă (necriptate)"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
+msgid "Enter Password"
+msgstr "Introduceţi parola"
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
+msgid "Aborting..."
+msgstr "Anulez..."
+
+#: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+msgid "Add"
+msgstr "Adaugă"
+
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Elimină \"{0}\" pentru"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Stabileşte {0}={1} pentru"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "obiect"
+msgstr[1] "obiecte"
+msgstr[2] "de obiecte"
+
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Rezolvă {0} conflicte în {1} obiecte"
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Schimbă"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
 msgid "Object"
 msgstr "Obiect"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Dată"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Nu a fost încă implementat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Readu toate obiectele selectate curent la starea din versiunea selectată în "
-"lista de istoric."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Command Stack"
-msgstr "Stivă comenzi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Deschide o listă cu toate comenzile (zonă tampon pentru anulare)."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, java-format
-msgid "This will change {0} object."
-msgid_plural "This will change {0} objects."
-msgstr[0] "Se va modifica {0} obiect."
-msgstr[1] "Se vor modifica {0} obiecte."
-msgstr[2] "Se vor modifica {0} de obiecte."
-
-#: ../../../../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.)"
-msgstr ""
-"Vă rog selectaţi o valoare nouă pentru \"{0}\".<br>(Un şir gol va şterge "
-"cheia.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
-msgid "Change values?"
-msgstr "Schimb valorile?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
-msgid "<different>"
-msgstr "<diferit>"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-msgid "Please select objects for which you want to change properties."
-msgstr ""
-"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "Please select a key"
-msgstr "Vă rog selectaţi o cheie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-msgid "Please select a value"
-msgstr "Vă rog selectaţi o valoare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Properties"
-msgstr "Proprietăţi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Property for selected objects."
-msgstr "Proprietăţi ale obiectelor selectate."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr "Nu am putut citi sursa prestabilită de adnotări: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Eroare la prelucrarea {0}: "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Key"
-msgstr "Cheie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Value"
-msgstr "Valoare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
-msgid "Please select the row to edit."
-msgstr "Vă rog selectaţi rândul care va fi editat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
-msgid "Please select the row to delete."
-msgstr "Vă rog selectaţi rândul care va fi şters."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-msgid "Add a new key/value pair to all objects"
-msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-#: ../../plugins/grid/src/grid/GridPlugin.java:43
-#: ../../plugins/grid/src/grid/GridPlugin.java:49
-msgid "Edit"
-msgstr "Editare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-msgid "Edit the value of the selected key for all objects"
-msgstr "Editează valoarea cheii selectata pentru toate obiectele"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-msgid "Delete the selected key in all objects"
-msgstr "Şterge cheia selectată din toate obiectele"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
-msgid "Delete the selected layer."
-msgstr "Şterge stratul selectat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
-msgid "Show/Hide"
-msgstr "Arată/Ascunde"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Toggle visible state of the selected layer."
-msgstr "Comută starea vizibilă a stratului selectat."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Layers"
-msgstr "Straturi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Open a list of all loaded layers."
-msgstr "Deschide o listă cu toate straturile încărcate."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
-msgid "Move the selected layer one row up."
-msgstr "Mută stratul selectat un rând în sus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
-msgid "Move the selected layer one row down."
-msgstr "Mută stratul selectat un rând în jos."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Uneşte stratul selectat cu stratul imediat inferior."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Tip necunoscut la linia {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 ""
-"Nu pot avea o listă de selecţie modificabilă cu valori implicite (linia {0})"
-
-#: ../../../../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."
-msgstr ""
-"display_values ({0}) şi values ({1}) trebuie să aibă acelaşi număr de "
-"elemente."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "element"
-msgstr[1] "elemente"
-msgstr[2] "de elemente"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Obiect adnotare {0} necunoscut la linia {1} coloana {2}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Modificare proprietăţi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "nod"
-msgstr[1] "noduri"
-msgstr[2] "de noduri"
-
-#: ../../../../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
-msgid "segment"
-msgid_plural "segments"
-msgstr[0] "segment"
-msgstr[1] "segmente"
-msgstr[2] "de segmente"
-
-#: ../../../../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
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "cale"
-msgstr[1] "căi"
-msgstr[2] "de căi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
-msgid "There were conflicts during import."
-msgstr "Au existat conflicte în timpul importului."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} constă în:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} şters.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#, fuzzy
+msgid "http://www.openstreetmap.org/traces"
+msgstr "Adresa de la www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, fuzzy, java-format
+msgid "Converted from: {0}"
+msgstr "Nu am putut citi de la adresa: \"{0}\""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:157
 msgid "track"
 msgid_plural "tracks"
@@ -1207,5 +1480,5 @@
 msgstr[2] "de urme"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgid "point"
 msgid_plural "points"
@@ -1214,5 +1487,5 @@
 msgstr[2] "de puncte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
 #, java-format
 msgid "a track with {0} point"
@@ -1222,5 +1495,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1230,5 +1503,5 @@
 msgstr[2] "{0} este format din {1} de urme"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
 #, java-format
 msgid "{0} point"
@@ -1238,106 +1511,130 @@
 msgstr[2] "{0} de puncte"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Do not draw lines between points for this layer."
 msgstr "Nu trasa linii între puncte pentru acest strat."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:150
 msgid "Customize Color"
 msgstr "Personalizează culoarea"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "OK"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:225
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Implicit"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Alegeţi o culoare"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:253
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr "Imagine JPEG (*.jpg)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:194
+msgid "There were conflicts during import."
+msgstr "Au existat conflicte în timpul importului."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} constă în:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} şters.)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr "Imagini pentru {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Citire GPS..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Nu există timp pentru punctul {0} x {1}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr "Nu am găsit imagini cu mărci de timp citibile."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr "Citesc {0}..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Start GPS: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Sfârşit GPS: {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr "diferentă curentă: {0}s"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr "diferenţă zonă de timp: "
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1346,165 +1643,98 @@
 msgstr[2] "de imagini"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} în urmă."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Sincronizare ceas"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Nu există timp EXIF în fişierul \"{0}\"."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Imagine"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zona de timp a unităţii GPS (diferenţă faţă de fotografie)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr "Sincronizare timp cu unitatea GPS"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr "Timpul introdus nu a putut fi interpretat."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
-msgid "Could not read bookmarks."
-msgstr "Nu am putut citi semnele de carte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
-msgid "Could not write bookmark."
-msgstr "Nu am putut scrie semnele de carte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Java Open Street Map - Editor"
-msgstr "Java Open Street Map - Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
-msgid "layer not in list."
-msgstr "stratul nu este în listă."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
-msgid "Hint: Some changes came from uploading new data to the server."
-msgstr ""
-"Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la "
-"server."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
-msgid "There are unsaved changes. Really quit?"
-msgstr "Există modificăre nesalvate. Într-adevăr ieşiţi?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
-msgid "Unsaved Changes"
-msgstr "Modificări nesalvate"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap Editor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "usage"
-msgstr "utilizare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "options"
-msgstr "opţiuni"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-msgid "Show this help"
-msgstr "Arată acest ajutor"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-msgid "Standard unix geometry argument"
-msgstr "Argument geometrie unix standard"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-msgid "Download the bounding box"
-msgstr "Descarcă perimetrul selectat"
-
-#: ../../../../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 "Descarcă locaţia de la adresă (cu 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 "Deschide fişierul (ca gps brut, dacă .gpx sau .csv)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
-msgid "Download the bounding box as raw gps"
-msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-msgid "Select with the given search"
-msgstr "Selectează cu căutarea dată"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-msgid "Don't launch in fullscreen mode"
-msgstr "Nu porni pe întreg ecranul"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-msgid "Reset the preferences to default"
-msgstr "Restabileşte preferinţele implicite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
-msgid "Set the language. Example: "
-msgstr "Precizează limba. Exemplu: "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
-msgid "examples"
-msgstr "exemple"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Parametrii sunt citiţi în ordinea în care sunt specificaţi, deci asiguraţi-"
-"vă\n"
-"că aţi încărcat date înainte de --selection"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr "Strat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr "Fişiere"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr "Conexiune"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:128
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:146
+#, fuzzy, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} este format din {1} urmă"
+msgstr[1] "{0} este format din {1} urme"
+msgstr[2] "{0} este format din {1} de urme"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:86
+msgid "There was an error while trying to play the sound file for this marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:88
+#, fuzzy
+msgid "Error playing sound"
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:42
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "(URL was: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#, fuzzy
+msgid "Error displaying URL"
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
 msgid "Contacting the OSM server..."
 msgstr "Contactez serverul OSM..."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Lat/Lon"
-msgstr "Lat/Lon"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Key"
+msgstr "Cheie"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
+msgid "Value"
+msgstr "Valoare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1514,172 +1744,156 @@
 msgstr[2] "{0} de obiecte au conflicte:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
 msgid "my version:"
 msgstr "versiunea mea:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
 msgid "their version:"
 msgstr "versiunea lor:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
 msgid "resolved version:"
 msgstr "rezolvat în versiunea:"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
-msgid "Error while parsing"
-msgstr "Eroare la prelucrare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
-msgid "File Not found"
-msgstr "Fişierul nu a fost găsit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "string"
-msgstr "şir"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-msgid "Name of the user."
-msgstr "Numele utilizatorului."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-msgid "OSM Password."
-msgstr "Parola OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-"Dimensionează aplicaţia la geometria precizată (format: LĂŢIMExÎNĂLŢIME)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "string;string;..."
-msgstr "şir;şir;..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Descarcă pe fiecare. Poate fi x1,y1,x2,y2 o adresă conţinând "
-"lat=y&lon=x&zoom=z sau un nume de fişier"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Descarcă pe fiecare ca gps neprelucrat. Poate fi x1,y1,x2,y2 sau o adresă "
-"conţinând lat=x&lon=y&zoom=z sau un nume de fişier"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
-msgstr ""
-"Adaugă pe fiecare la selecţia iniţială. Poate fi un şir de căutare tip "
-"google sau o adresă care întoarce osm-xml"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "any"
-msgstr "oricare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
-msgid "If specified, reset the configuration instead of reading it."
-msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
-msgid "Username"
-msgstr "Nume utilizator"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
-msgid "Password"
-msgstr "Parolă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
-msgid "You have to restart JOSM for some settings to take effect."
-msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
-msgid "Draw lines between raw gps points."
-msgstr "Trasează linii între puncte gps neprelucrate"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
-msgid "Force lines if no segments imported."
-msgstr "Forţează linii dacă nu a fost importat nici un segment."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
-msgid "Draw large GPS points."
-msgstr "Desenează puncte GPS mari."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
-msgid "Draw Direction Arrows"
-msgstr "Desenează săgeţi direcţionale"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
-msgstr ""
-"Forţează desenarea liniilor dacă datele importate nu conţin informatii "
-"despre linii."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
-msgid "Draw larger dots for the GPS points."
-msgstr "Desenează puncte mai pari pentru punctele GPS."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
-msgid "Draw direction hints for all segments."
-msgstr "Desenează indicii despre direcţie pentru toate segmentele."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
-msgid "Color"
-msgstr "Culoare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
-msgid "Name"
-msgstr "Nume"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
-msgid "Choose"
-msgstr "Alegeţi"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
-msgid "Please select a color."
-msgstr "Vă rog selectaţi o culoare."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
-#, java-format
-msgid "Choose a color for {0}"
-msgstr "Alegeţi o culoare pentru {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
-msgid "Annotation preset source"
-msgstr "Sursă predefinită de adnotări"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
-msgid "The base URL to the OSM server (REST API)"
-msgstr "Adresa de bază pentru serverul OSM (API REST)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
-msgid "Login name (email) to the OSM account."
-msgstr "Nume autentificare (email) pentru contul OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
-"nici o parolă."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
-msgid "The base URL to the server retrieving WMS background pictures from."
-msgstr "Adresa de bază a serverului pentru obţinerea imaginilor WMS de fundal."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+msgid "Layer"
+msgstr "Strat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+msgid "Edit"
+msgstr "Editare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
+#: ../osmarender/src/OsmarenderPlugin.java:98
+#: ../osmarender/src/OsmarenderPlugin.java:104
+msgid "View"
+msgstr "Vizualizare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
+msgid "Files"
+msgstr "Fişiere"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
+msgid "Connection"
+msgstr "Conexiune"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
+msgid "Tools"
+msgstr "Unelte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
+#, fuzzy
+msgid "Zoom To"
+msgstr "Apropie"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:28
+msgid "Projection method"
+msgstr "Metodă de proiecţie"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#, fuzzy
+msgid "Configure available plugins."
+msgstr "Configurează modulele disponibile."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+msgid "Get more plugins"
+msgstr "Preia mai multe module."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#, java-format
+msgid "Downloaded plugin information from {0} site"
+msgid_plural "Downloaded plugin information from {0} sites"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#, fuzzy
+msgid "No plugin information found."
+msgstr "Modulul nu a fost găsit: {0}."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#, fuzzy
+msgid "Update current"
+msgstr "Salvează datele curente."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+msgid "Not implemented yet."
+msgstr "Nu a fost încă implementat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#, fuzzy
+msgid "Configure Plugin Sites"
+msgstr "Configurează modulele disponibile."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:116
+msgid "Plugin bundled with JOSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:160
+#, java-format
+msgid "Error reading plugin information file: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:186
+#, fuzzy, java-format
+msgid ""
+"Download the following plugins?\n"
+"\n"
+"{0}"
+msgstr "Descarc următoarele date:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#, fuzzy
+msgid "Download missing plugins"
+msgstr "Descarc date"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+#, fuzzy
+msgid "Advanced Preferences"
+msgstr "Preferinţe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:64
+#, fuzzy
+msgid "Enter a new key/value pair"
+msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Please select the row to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Aspect"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1698,7 +1912,41 @@
 "virgulă.</html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
-msgid ""
-"If your gps device draw to few lines, select this to draw lines along your "
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr ""
+"Specificaţie pentru import CSV (gol: citeşte din prima linie a datelor)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Trasează linii între puncte gps neprelucrate"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+msgid "Force lines if no segments imported."
+msgstr "Forţează linii dacă nu a fost importat nici un segment."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+msgid "Draw large GPS points."
+msgstr "Desenează puncte GPS mari."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+msgid "Draw Direction Arrows"
+msgstr "Desenează săgeţi direcţionale"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+#, fuzzy
+msgid ""
+"If your gps device draw too few lines, select this to draw lines along your "
 "way."
 msgstr ""
@@ -1706,65 +1954,158 @@
 "pentru a desena linii pe cale."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Forţează desenarea liniilor dacă datele importate nu conţin informatii "
+"despre linii."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Draw larger dots for the GPS points."
+msgstr "Desenează puncte mai pari pentru punctele GPS."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Draw direction hints for all segments."
+msgstr "Desenează indicii despre direcţie pentru toate segmentele."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+msgid "Draw the order numbers of all segments within their way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#, fuzzy
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Descarcă hărţi de la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgid "Draw the inactive data layers in a different color."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid "Display Settings"
+msgstr "Configurări afişare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Diferite opţiuni care influenţează reprezentarea vizuală a întregului "
+"program."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings"
+msgstr "Configurări conexiune"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#, fuzzy
+msgid "Connection Settings for the OSM server."
+msgstr "Configurări conexiune la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Map Settings"
+msgstr "Opţiuni hartă"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Settings for the map projection and data interpretation."
+msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:78
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:53
+#, fuzzy
+msgid "Tagging preset source"
+msgstr "Sursă predefinită de adnotări"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#, fuzzy
+msgid ""
+"The sources (url or filename) of tagging preset definition files. See http://"
+"josm.eigenheimstrasse.de/wiki/TaggingPresets for help."
+msgstr ""
+"Sursele (adresă sau nume de fişier) ale fişierelor cu adnotări predefinite. "
+"Vedeţi http://josm.eigenheimstrasse.de/wiki/AnnotationPresets pentru ajutor."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#, fuzzy
+msgid "Add a new tagging preset source to the list."
+msgstr "Adaugă o nouă sursă de adnotări predefinite la listă."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:426
+msgid "Delete the selected source from the list."
+msgstr "Şterge sursele selectate din listă."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#, fuzzy
+msgid "Tagging preset sources"
+msgstr "Surse de adnotări predefinite"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:48
+msgid "Color"
+msgstr "Culoare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:49
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Nume"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
+msgid "Choose"
+msgstr "Alegeţi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:122
+msgid "Please select a color."
+msgstr "Vă rog selectaţi o culoare."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:127
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Alegeţi o culoare pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:132
 msgid "Colors used by different objects in JOSM."
 msgstr "Culori utilizate de diferite obiecte în JOSM."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
-msgid ""
-"The sources (url or filename) of annotation preset definition files. See "
-"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
-msgstr ""
-"Sursele (adresă sau nume de fişier) ale fişierelor cu adnotări predefinite. "
-"Vedeţi http://josm.eigenheimstrasse.de/wiki/AnnotationPresets pentru ajutor."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
-msgid "Add a new annotation preset source to the list."
-msgstr "Adaugă o nouă sursă de adnotări predefinite la listă."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
-msgid "Delete the selected source from the list."
-msgstr "Şterge sursele selectate din listă."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid "Display Settings"
-msgstr "Configurări afişare"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr ""
-"Diferite opţiuni care influenţează reprezentarea vizuală a întregului "
-"program."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
-msgid "Look and Feel"
-msgstr "Aspect"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
 msgid "Colors"
 msgstr "Culori"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings"
-msgstr "Configurări conexiune"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
-msgid "Connection Settings to the OSM server."
-msgstr "Configurări conexiune la serverul OSM."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
+#, fuzzy
+msgid "The base URL for the OSM server (REST API)"
+msgstr "Adresa de bază pentru serverul OSM (API REST)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgid "Login name (email) to the OSM account."
+msgstr "Nume autentificare (email) pentru contul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
+"nici o parolă."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Adresă server principal"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
 msgid "OSM username (email)"
 msgstr "Nume utilizator OSM (email)"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "OSM password"
 msgstr "Parola OSM"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1776,359 +2117,1362 @@
 "adresă.<br><b>Nu folosiţi o parolă importantă.</b></html>"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
-msgid "CSV import specification (empty: read from first line in data)"
-msgstr ""
-"Specificaţie pentru import CSV (gol: citeşte din prima linie a datelor)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Map Settings"
-msgstr "Opţiuni hartă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
-msgid "Settings for the map projection and data interpretation."
-msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
-msgid "Projection method"
-msgstr "Metodă de proiecţie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
-msgid "Annotation preset sources"
-msgstr "Surse de adnotări predefinite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Plugins"
-msgstr "Module"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
-msgid "Configure available Plugins."
-msgstr "Configurează modulele disponibile."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
-msgid "Get more plugins"
-msgstr "Preia mai multe module."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Descarc punctele {0} până la {1}..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Descarc datele OSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
-msgid "Unknown version"
-msgstr "Versiune necunoscută"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
-msgid "Found <seg> tag on non-way."
-msgstr "Am găsit eticheta <seg> pe o non-cale."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
-msgid "Incomplete segment with id=0"
-msgstr "Segment incomplet cu id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
+msgid "Could not read bookmarks."
+msgstr "Nu am putut citi semnele de carte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
+msgid "Could not write bookmark."
+msgstr "Nu am putut scrie semnele de carte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:109
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#, fuzzy
+msgid "Java OpenStreetMap - Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:147
+msgid "layer not in list."
+msgstr "stratul nu este în listă."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+msgid "Getting Started"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:63
+#, fuzzy
+msgid "[Download] some data from the OSM server"
+msgstr "Descarcă hărţi de la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
+msgid "Getting Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:68
+msgid "Open the [online help] (english only)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+msgid "Watch some [tutorial videos]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Join the newbie [mailing list]"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:191
+#, fuzzy
+msgid "Unknown type"
+msgstr "Gazdă necunoscută"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:241
+#, fuzzy, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "Nu am putut citi sursa prestabilită de adnotări: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:244
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:145
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:277
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Schimb {0} obiect"
+msgstr[1] "Schimb {0} obiecte"
+msgstr[2] "Schimb {0} de obiecte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:307
+msgid "Change Properties"
+msgstr "Modificare proprietăţi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload Preferences"
+msgstr "Preferinţe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+#, fuzzy
+msgid "Upload the current preferences to the server"
+msgstr "Trimite toate schimbările la serverul OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+msgid "string"
+msgstr "şir"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+msgid "Name of the user."
+msgstr "Numele utilizatorului."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+msgid "OSM Password."
+msgstr "Parola OSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+#, fuzzy
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr ""
+"Dimensionează aplicaţia la geometria precizată (format: LĂŢIMExÎNĂLŢIME)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid "string;string;..."
+msgstr "şir;şir;..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:49
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Descarcă pe fiecare. Poate fi x1,y1,x2,y2 o adresă conţinând "
+"lat=y&lon=x&zoom=z sau un nume de fişier"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:50
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Descarcă pe fiecare ca gps neprelucrat. Poate fi x1,y1,x2,y2 sau o adresă "
+"conţinând lat=x&lon=y&zoom=z sau un nume de fişier"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:51
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+msgstr ""
+"Adaugă pe fiecare la selecţia iniţială. Poate fi un şir de căutare tip "
+"google sau o adresă care întoarce osm-xml"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "any"
+msgstr "oricare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Click Reload to refresh list"
+msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+msgid "Reload"
+msgstr "Reîncarcă"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Revert"
+msgstr "Anulează"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "History"
+msgstr "Istoric"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "Display the history of all selected items."
+msgstr "Afişează istoricul tuturor elementelor selectate."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
+msgid "Date"
+msgstr "Dată"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:142
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Readu toate obiectele selectate curent la starea din versiunea selectată în "
+"lista de istoric."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+msgid "Delete the selected layer."
+msgstr "Şterge stratul selectat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:70
+msgid "Do you really want to delete the whole layer?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+msgid "Show/Hide"
+msgstr "Arată/Ascunde"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#, fuzzy
+msgid "Show/Hide Text"
+msgstr "Arată/Ascunde"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#, fuzzy
+msgid "Toggle visible state of the marker text."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Layers"
+msgstr "Straturi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Deschide o listă cu toate straturile încărcate."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:221
+msgid "Move the selected layer one row up."
+msgstr "Mută stratul selectat un rând în sus."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:227
+msgid "Move the selected layer one row down."
+msgstr "Mută stratul selectat un rând în jos."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:241
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Uneşte stratul selectat cu stratul imediat inferior."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Merging conflicts."
+msgstr "Îmbin conflictele."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Resolve"
+msgstr "Rezolvă"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de "
+"mai sus."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid "Select"
+msgstr "Selectaţi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
+"mai sus."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:109
+msgid "Please select something from the conflict list."
+msgstr "Vă rog selectaţi ceva din lista de conflicte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "Resolve Conflicts"
+msgstr "Rezolvare conflicte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Authors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:48
+msgid "Open a list of people working on the selected objects."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+msgid "Author"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:50
+#, fuzzy
+msgid "# Objects"
+msgstr "Obiect"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Se va modifica {0} obiect."
+msgstr[1] "Se vor modifica {0} obiecte."
+msgstr[2] "Se vor modifica {0} de obiecte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:106
+msgid "An empty value deletes the key."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+msgid "Change values?"
+msgstr "Schimb valorile?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:394
+msgid "<different>"
+msgstr "<diferit>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:160
+#, fuzzy, java-format
+msgid "Change properties of {0} object"
+msgid_plural "Change properties of {0} objects"
+msgstr[0] "Schimb {0} obiect"
+msgstr[1] "Schimb {0} obiecte"
+msgstr[2] "Schimb {0} de obiecte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+msgid "Please select objects for which you want to change properties."
+msgstr ""
+"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+msgid "Please select a key"
+msgstr "Vă rog selectaţi o cheie"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+msgid "Please select a value"
+msgstr "Vă rog selectaţi o valoare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+msgid "Properties"
+msgstr "Proprietăţi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:278
+#, fuzzy
+msgid "Properties for selected objects."
+msgstr "Proprietăţi ale obiectelor selectate."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+msgid "Add a new key/value pair to all objects"
+msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+msgid "Edit the value of the selected key for all objects"
+msgstr "Editează valoarea cheii selectata pentru toate obiectele"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+msgid "Delete the selected key in all objects"
+msgstr "Şterge cheia selectată din toate obiectele"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Stivă comenzi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Deschide o listă cu toate comenzile (zonă tampon pentru anulare)."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Current Selection"
+msgstr "Selecţia curentă"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Open a selection list window."
+msgstr "Deschide o fereastra cu o listă de selecţie."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
+msgid "Error while parsing"
+msgstr "Eroare la prelucrare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+#, fuzzy
+msgid "File not found"
+msgstr "Fişierul nu a fost găsit"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:49
+msgid "You can paste an URL here to download the area."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lat"
+msgstr "min lat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "min lon"
+msgstr "min lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lat"
+msgstr "max lat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+msgid "max lon"
+msgstr "max lon"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "URL from www.openstreetmap.org"
+msgstr "Adresa de la www.openstreetmap.org"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:166
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:169
+msgid "Download area ok, size probably acceptable to server"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:99
+msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:64
+msgid "Please enter the desired coordinates first."
+msgstr "Vă rog întâi introduceţi coordonatele dorite."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
+msgid "Please enter a name for the location."
+msgstr "Vă rog introduceţi un nume pentru locaţie."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+msgid "Remove"
+msgstr "Elimină"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Select a bookmark first."
+msgstr "Selectaţi întâi un semn de carte."
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:74
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:106
+#, fuzzy
+msgid "Download Area"
+msgstr "Descarc?"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap Editor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgid "usage"
+msgstr "utilizare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+msgid "options"
+msgstr "opţiuni"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+msgid "Show this help"
+msgstr "Arată acest ajutor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid "Standard unix geometry argument"
+msgstr "Argument geometrie unix standard"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgid "Download the bounding box"
+msgstr "Descarcă perimetrul selectat"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Deschide fişierul (ca gps brut, dacă .gpx sau .csv)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid "Download the bounding box as raw gps"
+msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgid "Select with the given search"
+msgstr "Selectează cu căutarea dată"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Don't launch in fullscreen mode"
+msgstr "Nu porni pe întreg ecranul"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "Reset the preferences to default"
+msgstr "Restabileşte preferinţele implicite"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
+msgid "Set the language. Example: "
+msgstr "Precizează limba. Exemplu: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "examples"
+msgstr "exemple"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Parametrii sunt citiţi în ordinea în care sunt specificaţi, deci asiguraţi-"
+"vă\n"
+"că aţi încărcat date înainte de --selection"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:92
+#, java-format
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:95
+#, fuzzy, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr "Nu am putut încărca modulul {0}"
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "A intervenit o eroare în modulul {0}"
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:193
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Latitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:195
+#: ../livegps/livegps/LiveGpsDialog.java:57
+msgid "Longitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:200
+#, fuzzy
+msgid "Grid layout"
+msgstr "strat"
+
+#: ../grid/src/grid/GridLayer.java:222
+#, fuzzy
+msgid "Grid layer:"
+msgstr "strat"
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:34
+#, java-format
+msgid ""
+"Do you want to load a basic tagging preset for your language ({0})?\n"
+"This is recommend for beginners of JOSM.\n"
+"\n"
+"'Cancel' will ask this question on next start again."
+msgstr ""
+
+#: ../tagging-preset-loader/src/TaggingPresetLoader.java:35
+msgid "Language Plugin detected"
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:86
+msgid "FireFox not found. Please set firefox executable in the preferences."
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:135
+#, fuzzy
+msgid "osmarender options"
+msgstr "Opţiuni exportare"
+
+#: ../osmarender/src/OsmarenderPlugin.java:136
+msgid "FireFox executable"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+#, fuzzy
+msgid "Version"
+msgstr "Revizia"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
+#, fuzzy
+msgid "Update"
+msgstr "date"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+#, fuzzy
+msgid "Add Site"
+msgstr "Adaugă nod"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
+msgid "Update Site Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+msgid "Invalid Url"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+#, fuzzy
+msgid "Delete Site(s)"
+msgstr "Şterge nod"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+#, fuzzy
+msgid "Please select the site to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
+#, fuzzy
+msgid "Please select the site(s) to check for updates."
+msgstr "Vă rog selectaţi cel puţin petru noduri."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+#, fuzzy
+msgid "Delete the selected site(s) from the list."
+msgstr "Şterge sursele selectate din listă."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
+msgid "Update Sites"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
+#, fuzzy, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+msgid "No validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+#, fuzzy
+msgid "Open the validation window."
+msgstr "Deschide o fereastra cu o listă de selecţie."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+msgid ""
+"A OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "ultima modificare la {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:35
+#, fuzzy
+msgid "Single node segments."
+msgstr "Adaugă un nod la segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:36
+msgid ""
+"This test checks that there are no segments with the same node as start and "
+"destination."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:44
+#, fuzzy
+msgid "Single node segments"
+msgstr "Adaugă un nod la segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+#, fuzzy
+msgid "Untagged nodes."
+msgstr "Modificări nesalvate"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+msgid "This test checks for untagged nodes that are not part of any segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:97
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:30
+msgid "Crossing roads."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:31
+msgid ""
+"This test checks if two roads,railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingSegments.java:83
+msgid "Crossing roads"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:26
+#, fuzzy
+msgid "Reused segments."
+msgstr "Inversează segmentele"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:27
+msgid "This test checks if a segment is used in more than one way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:45
+#, fuzzy
+msgid "Reused segments"
+msgstr "Inversează segmentele"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
+#, fuzzy
+msgid "Tagged segments"
+msgstr "segmente"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:30
+msgid "This test checks that no segment is tagged. Only ways should be tagged."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:45
+msgid "Segments with tags"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:29
+msgid "Similar named ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:30
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:75
+msgid "Similar named ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Elimină \"{0}\" pentru"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:29
+msgid "Duplicated segments."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:30
+msgid "This test checks that two nodes are not used by more than one segment."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateSegment.java:48
+#, fuzzy
+msgid "Duplicated segments"
+msgstr "Adaugă segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:22
+msgid "Unordered ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:23
+msgid "This test checks that all segments in a way are properly ordered."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UnorderedWay.java:34
+msgid "Unordered ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:111
+#, fuzzy
+msgid "Properties checker."
+msgstr "Proprietăţi"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:112
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:178
+#, fuzzy, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr "Nu am putut redenumi fişierul \"{0}\"."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:241
+msgid "Tags with empty values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:246
+msgid "Invalid property keys"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:254
+msgid "Unknown property values"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:262
+msgid "FIXMES"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:370
+#, fuzzy
+msgid "Check property keys."
+msgstr "Modificare proprietăţi"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:371
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:403
+msgid "Spellcheck source"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:423
+#, fuzzy
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+msgstr ""
+"Sursele (adresă sau nume de fişier) ale fişierelor cu adnotări predefinite. "
+"Vedeţi http://josm.eigenheimstrasse.de/wiki/AnnotationPresets pentru ajutor."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:424
+#, fuzzy
+msgid "Add a new spellcheck source to the list."
+msgstr "Adaugă o nouă sursă de adnotări predefinite la listă."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:425
+#, fuzzy
+msgid "Edit the selected source."
+msgstr "Şterge stratul selectat."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:428
+msgid "Spellcheck data sources"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:450
+#, fuzzy
+msgid "Check property values."
+msgstr "Modificare proprietăţi"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:451
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:459
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:460
+msgid "Looks for nodes, segments or ways with FIXME in any property value."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:28
+#, fuzzy
+msgid "Orphaned segments."
+msgstr "Adaugă segment"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:29
+msgid "This test checks that every segment is in a way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OrphanSegment.java:44
+#, fuzzy
+msgid "Segments not in a way"
+msgstr "Adaug segmente căii?"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:37
+#, fuzzy
+msgid "Untagged ways."
+msgstr "Imagini geoetichetate"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:38
+msgid "This test checks for untagged ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:66
+#, fuzzy
+msgid "Unnamed ways"
+msgstr "fără nume"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
+#, fuzzy
+msgid "Untagged ways"
+msgstr "Imagini geoetichetate"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+msgid "Duplicated nodes."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:109
+#, fuzzy
+msgid "Nodes have conflicting key: "
+msgstr "Chei în conflict"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
+#, fuzzy
+msgid "Merge Nodes"
+msgstr "Şterge nod"
+
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
+msgid "WMS"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Eroare la transformarea longitudinii pentru administratorul de imagini. Nu "
+"pot opera pe {0}"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+#, fuzzy
+msgid "WMS Plugin Preferences"
+msgstr "Preferinţe"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:24
+#, fuzzy
+msgid "Downloading "
+msgstr "Descarc date"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
+msgid ""
+"<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
+"<b>must</b> be configured with the javascript 'dump' method,<br>that can be "
+"activated with the property 'browser.dom.window.dump.enabled=true' in the "
+"about:config page.</html>"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
+msgid ""
+"<html>The port that the server will use to listen WMS requests<br>The WMS "
+"plugin need to be configured to use this port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
+msgid ""
+"<html>Name of the profile.<br>This profile is used to avoid nag firefox "
+"screens asking you to resume failed sessions.<br>Just set the selected "
+"profile as not default in the profile selection window and configure to not "
+"ask<br>about failed sessions with 'browser.sessionstore."
+"resume_from_crash=false' in the about:config page"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Yahoo! WMS server"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Settings for the Yahoo! imagery server."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
+#, fuzzy
+msgid "YWMS options"
+msgstr "opţiuni"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
+msgid "Firefox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
+msgid "Firefox profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
+#, fuzzy
+msgid "Create"
+msgstr "Crează o nouă cale"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
+msgid "Server port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
+#, fuzzy
+msgid "Please name the profile you want to create."
+msgstr ""
+"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
+msgid "Creating profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
+msgid "You have to select some segments that don't belong to any way."
+msgstr ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy, java-format
+msgid "Create {0} way from {1} segments?"
+msgid_plural "Create {0} ways from {1} segments?"
+msgstr[0] "Crează o cale nouă din {0} segment?"
+msgstr[1] "Crează o cale nouă din {0} segmente?"
+msgstr[2] "Crează o cale nouă din {0} de segmente?"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:81
+#, fuzzy
+msgid "Create ways"
+msgstr "Crează o nouă cale"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:82
+#, fuzzy
+msgid "Create linear ways"
+msgstr "Crează o nouă cale"
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "cale"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, fuzzy, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Nu am putut citi de la adresa: \"{0}\""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:56
+msgid "start"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:58
+msgid "end"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:43
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:53
+msgid "Center Once"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:64
+msgid "Auto-Center on current position"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:95
+#: ../livegps/livegps/LiveGpsAcquirer.java:110
+#, fuzzy
+msgid "Connecting"
+msgstr "Conexiune"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:169
+#, fuzzy
+msgid "Connected"
+msgstr "Conexiune"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:181
+#: ../livegps/livegps/LiveGpsAcquirer.java:196
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:190
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Conexiune"
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:48
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Date GPS neprelucrate"
+
+#: ../livegps/livegps/LiveGpsDialog.java:51
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#, fuzzy
+msgid "Way Info"
+msgstr "Informaţii"
+
+#: ../livegps/livegps/LiveGpsDialog.java:59
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:61
+#, fuzzy
+msgid "Course"
+msgstr "Alegeţi"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid "Tagging Preset Tester"
+msgstr "Tester de adnotări predefinite"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+"Deschide unealta de test a adnotărilor pentru a previzualiza mesajele cu "
+"adnotări predefinite."
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+#, fuzzy
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr "Mai întâi trebuie să specificaţi surse de adnotări în preferinţe."
+
+#: ../namefinder/namefinder/PlaceSelection.java:39
+#, fuzzy
+msgid "Search..."
+msgstr "Căutare"
+
+#: ../namefinder/namefinder/PlaceSelection.java:101
 msgid "NullPointerException. Possible some missing tags."
 msgstr "Excepţie pointer nul. Posibil lipsesc nişte etichete."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
-msgid "Illegal object with id=0"
-msgstr "Obiect ilegal cu id=0"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr "Nu am putut citi formatul de timp \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr "Lipseşte atributul necesar \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
-msgid "Preparing data..."
-msgstr "Pregătesc datele..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
-msgid "Illformed Node id"
-msgstr "Note id malformat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
-#, java-format
-msgid "Upload {0} {1} ({2})..."
-msgstr "Transmit {0} {1} ({2})..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
-msgid "Unknown host"
-msgstr "Gazdă necunoscută"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
-#: ../../plugins/waypoints/src/WaypointReader.java:55
+#: ../namefinder/namefinder/PlaceSelection.java:150
+msgid "Cannot read place search results from server"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:159
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:166
+msgid "Places"
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:55
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr "Eroare date: valoarea lat \"{0}\" este în afara limitelor."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
-#: ../../plugins/waypoints/src/WaypointReader.java:59
+#: ../waypoints/src/WaypointReader.java:59
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Eroare date: valoarea lon \"{0}\" este în afara limitelor."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
-msgid "Could not detect data format string."
-msgstr "Nu am putut detecta şirul de format al datelor."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
-msgid ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-msgstr ""
-"Şirul de format al datelor este incomplet sau nu a putut fi găsit. Încercaţi "
-"să precizaţi manual un şir de format în Preferinţe."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-"Şirul de format este incomplet. E necesar să fie specificate cel puţin 'lat' "
-"şi 'lon'"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-#, java-format
-msgid "Unknown data type: \"{0}\"."
-msgstr "Tip de date necunoscut: \"{0}\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-msgid "Maybe add an format string in preferences."
-msgstr "Puteţi să adăugaţi un şir de format în preferinţe."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr "Eroare de prelucrare la linia {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
-msgid "Incorrect password or username."
-msgstr "Parolă sau nume utilizator incorecte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Atenţie: Parola este transferată necriptată."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Save user and password (unencrypted)"
-msgstr "Salvează nume utilizator şi parolă (necriptate)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
-msgid "Enter Password"
-msgstr "Introduceţi parola"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
-msgid "Aborting..."
-msgstr "Anulez..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr "Eroare de date: Segmentul {0} a fost sterş dar este parte a căii {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 ""
-"Eroare de date: Nodul {0} a fost şters dar este parte a segmentului {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr "Eroare la prelucrare."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr "poziţie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr "diferit"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr "şters"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr "adevărat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr "fals"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr "nici unul"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr "segmente"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
-msgid "to"
-msgstr "la"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
-msgid "from"
-msgstr "de la"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "new"
-msgstr "nou"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "unknown"
-msgstr "necunoscut"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} nod"
-msgstr[1] "{0} noduri"
-msgstr[2] "{0} de noduri"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
-msgid "incomplete"
-msgstr "incomplet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-msgid "background"
-msgstr "fundal"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
-msgid "incomplete way"
-msgstr "cale incompletă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
-msgid "selected"
-msgstr "selectat"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
-msgid "gps point"
-msgstr "punct gps"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
-msgid "scale"
-msgstr "scală"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Rezolvă {0} conflicte în {1} obiecte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr "Schimbă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
-msgid "Sequence"
-msgstr "Secvenţă"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr "Elimină \"{0}\" pentru"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr "Stabileşte {0}={1} pentru"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "obiect"
-msgstr[1] "obiecte"
-msgstr[2] "de obiecte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
-#, java-format
-msgid "Plugin not found: {0}."
-msgstr "Modulul nu a fost găsit: {0}."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
-#, java-format
-msgid "Could not load plugin {0}."
-msgstr "Nu am putut încărca modulul {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
-msgid "unnamed"
-msgstr "fără nume"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271
-msgid "The projection could not be read from preferences. Using EPSG:4263."
-msgstr "Proiecţia nu a putut fi citită din preferinte. Folosesc EPSG:4263."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignor adresa malformată: \"{0}\""
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignor adresa malformată către fişier: \"{0}\""
-
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:102
-#: ../../plugins/osmarender/src/OsmarenderPlugin.java:108
-msgid "View"
-msgstr "Vizualizare"
-
-#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:18
-msgid "Landsat background images"
-msgstr "Imagini de fundal Landsat"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr ""
-"Eroare la transformarea longitudinii pentru administratorul de imagini. Nu "
-"pot opera pe {0}"
-
-#: ../../plugins/landsat/src/landsat/LandsatLayer.java:70
-#, java-format
-msgid "WMS layer: {0}"
-msgstr "Stratul WMS: {0}"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr "Tester de adnotări predefinite"
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr ""
-"Deschide unealta de test a adnotărilor pentru a previzualiza mesajele cu "
-"adnotări predefinite."
-
-#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr "Mai întâi trebuie să specificaţi surse de adnotări în preferinţe."
-
-#: ../../plugins/grid/src/grid/GridLayer.java:74
-#, fuzzy
-msgid "Grid layer:"
-msgstr "strat"
-
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open waypoints file"
 msgstr "Deschide un fişier."
 
-#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#: ../waypoints/src/WaypointOpenAction.java:33
 #, fuzzy
 msgid "Open a waypoints file."
 msgstr "Deschide un fişier."
 
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#, fuzzy
+msgid "Please select a scheme to use."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
+#, fuzzy
+msgid "Please select the scheme to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
+#, fuzzy
+msgid "Use the selected scheme from the list."
+msgstr "Şterge sursele selectate din listă."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#, fuzzy
+msgid "Use the current colors as a new color scheme."
+msgstr "Salvează datele curente într-un fişier nou."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#, fuzzy
+msgid "Delete the selected scheme from the list."
+msgstr "Şterge sursele selectate din listă."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#, fuzzy
+msgid "Color Schemes"
+msgstr "Culori"
+
+#~ msgid "Add Node into Segment"
+#~ msgstr "Adaugă nod în segment"
+
+#~ msgid "Executing {0}"
+#~ msgstr "Execut {0}"
+
+#~ msgid "The Tool requires some data to be loaded."
+#~ msgstr "Această unealtă necesită să fie încărcate nişte date."
+
+#~ msgid "Could not execute command: {0}"
+#~ msgstr "Nu am putut executa comanda: {0}"
+
+#~ msgid "Could not read external tool configuration."
+#~ msgstr "Nu am putut citi configuraţia uneltei externe."
+
+#~ msgid ""
+#~ "Move and zoom the image like the main map. Select an area to download by "
+#~ "dragging."
+#~ msgstr ""
+#~ "Mută şi măreşte imaginea ca şi harta principală. Selectaţi prin tragere "
+#~ "zona ce va fi descărcată."
+
+#~ msgid "Bounding box"
+#~ msgstr "Perimetru selectat"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Semne de carte"
+
+#~ msgid "Choose an area"
+#~ msgstr "Alegeţi o zonă"
+
+#~ msgid "Please enter the desired coordinates or click on a bookmark."
+#~ msgstr ""
+#~ "Vă rog introduceţi coordonetele dorite sau faceţi clic pe un semn de "
+#~ "carte."
+
+#~ msgid "Auto Scale: {0}"
+#~ msgstr "Scalare automată: {0}"
+
+#~ msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+#~ msgstr ""
+#~ "Mărire automată pentru a vizualiza (la {0}. Dezactivat dacă vizualizarea "
+#~ "este mutată)"
+
+#~ msgid "Downloading {0} segment"
+#~ msgid_plural "Downloading {0} segments"
+#~ msgstr[0] "Descarc {0} segment"
+#~ msgstr[1] "Descarc {0} segmente"
+#~ msgstr[2] "Descarc {0} de segmente"
+
+#~ msgid ""
+#~ "The plugin {0} throwed an exception: {1}\n"
+#~ "It may be outdated. Please contact the plugin's autor.\n"
+#~ "This message will not shown again until JOSM is restarted."
+#~ msgstr ""
+#~ "Modulul {0} a generat o excepţie: {1}\n"
+#~ "Ar putea să fie învechit. Vă rog contactaţi autorul modulului.\n"
+#~ "Acest mesaj nu va fi arătat din nou până nu se reporneşte JOSM."
+
+#~ msgid ""
+#~ "Please send this to josm@eigenheimstrasse.de\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Vă rog trimiteţi asta la josm@eigenhaimstrasse.de\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+#~ msgstr ""
+#~ "Vă rog selectaţi o valoare nouă pentru \"{0}\".<br>(Un şir gol va şterge "
+#~ "cheia.)"
+
+#~ msgid "Unknown type at line {0}"
+#~ msgstr "Tip necunoscut la linia {0}"
+
+#~ msgid "Cannot have a writable combobox with default values (line {0})"
+#~ msgstr ""
+#~ "Nu pot avea o listă de selecţie modificabilă cu valori implicite (linia "
+#~ "{0})"
+
+#~ msgid ""
+#~ "display_values ({0}) and values ({1}) must be of same number of elements."
+#~ msgstr ""
+#~ "display_values ({0}) şi values ({1}) trebuie să aibă acelaşi număr de "
+#~ "elemente."
+
+#~ msgid "element"
+#~ msgid_plural "elements"
+#~ msgstr[0] "element"
+#~ msgstr[1] "elemente"
+#~ msgstr[2] "de elemente"
+
+#~ msgid "Unknown annotation object {0} at line {1} column {2}"
+#~ msgstr "Obiect adnotare {0} necunoscut la linia {1} coloana {2}"
+
+#~ msgid "The base URL to the server retrieving WMS background pictures from."
+#~ msgstr ""
+#~ "Adresa de bază a serverului pentru obţinerea imaginilor WMS de fundal."
+
+#~ msgid "Landsat background images"
+#~ msgstr "Imagini de fundal Landsat"
+
+#~ msgid "WMS layer: {0}"
+#~ msgstr "Stratul WMS: {0}"
+
 #~ msgid "Download {0} ways containing a total of {1} segments?"
 #~ msgstr "Descarc {0} căi conţinând în total {1} segmente?"
@@ -2137,7 +3481,4 @@
 #~ msgstr "Reîncarcă lista de selecţii"
 
-#~ msgid "Search for objects."
-#~ msgstr "Caută obiecte"
-
 #~ msgid "Language"
 #~ msgstr "Limbă"
@@ -2146,7 +3487,4 @@
 #~ msgstr "Conflicte în obiecte disjuncte"
 
-#~ msgid "Downloading {0} {1}"
-#~ msgstr "Descarc {0} {1}"
-
 #~ msgid "Got more than one object when expecting only one."
 #~ msgstr "Am primit mai mult de un obiect când mă aşteptam doar la unul."
