Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 3995)
+++ /applications/editors/josm/plugins/build.xml	(revision 3996)
@@ -14,15 +14,15 @@
 
 
-	<target name="init">
+	<target name="compile_josm">
+		<ant dir="../core" target="dist" />
 	</target>
 
-	<target name="compile" depends="init">
+	<target name="compile" depends="compile_josm">
 	</target>
 
 	<target name="build" depends="compile">
-		<ant dir="../core" antfile="build.xml" target="dist"/>
 		<ant dir="colorscheme" antfile="build.xml" target="dist"/>
-		<!--<ant dir="grid" antfile="build.xml" target="build"/>-->
-		<!--<ant dir="lang" antfile="build.xml" target="dist"/>-->
+		<!--ant dir="grid" antfile="build.xml" target="build"/-->
+		<ant dir="lang" antfile="build.xml" target="install-all"/>
 		<ant dir="livegps" antfile="build.xml" target="dist"/>
 		<ant dir="mappaint" antfile="build.xml" target="build"/>
@@ -44,8 +44,7 @@
 
 	<target name="clean">
-		<ant dir="../core" antfile="build.xml" target="clean"/>
 		<ant dir="colorscheme" antfile="build.xml" target="clean"/>
-		<!--<ant dir="grid" antfile="build.xml" target="clean"/>-->
-		<!--<ant dir="lang" antfile="build.xml" target="clean"/>-->
+		<!--ant dir="grid" antfile="build.xml" target="clean"/-->
+		<ant dir="lang" antfile="build.xml" target="clean"/>
 		<ant dir="livegps" antfile="build.xml" target="clean"/>
 		<ant dir="mappaint" antfile="build.xml" target="clean"/>
Index: /applications/editors/josm/plugins/lang/build.xml
===================================================================
--- /applications/editors/josm/plugins/lang/build.xml	(revision 3995)
+++ /applications/editors/josm/plugins/lang/build.xml	(revision 3996)
@@ -13,4 +13,5 @@
 	<target name="install">
 		<mkdir dir="${language}/bin"/>
+		<mkdir dir="dist"/>
 		<javac srcdir="${language}/src" classpath="${josm}/dist/josm-custom.jar" destdir="${language}/bin" />
 
@@ -25,5 +26,5 @@
 		<copy file="i18n.properties" todir="${language}/bin/org/openstreetmap/josm" />
 
-		<jar destfile="${user.home}/.josm/plugins/lang-${language}.jar" basedir="${language}/bin">
+		<jar destfile="dist/lang-${language}.jar" basedir="${language}/bin">
 			<manifest>
 				<attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
Index: /applications/editors/josm/plugins/lang/de/de.po
===================================================================
--- /applications/editors/josm/plugins/lang/de/de.po	(revision 3995)
+++ /applications/editors/josm/plugins/lang/de/de.po	(revision 3996)
@@ -7,5 +7,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 14:05+0200\n"
+"POT-Creation-Date: 2007-08-07 23:37+0200\n"
 "PO-Revision-Date: 2006-10-14 20:38+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -17,48 +17,437 @@
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../../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/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/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/MainApplet.java:78
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+msgid "Password"
+msgstr "Passwort"
+
+#: ../../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/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+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:76
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../../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/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/PleaseWaitDialog.java:23
+msgid "Contacting the OSM server..."
+msgstr "Versuche OSM Server zu erreichen...."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../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:142
+#, 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/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/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/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/MarkerLayer.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+msgid "Customize Color"
+msgstr "Farben anpassen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr "Okay"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Farbe auswählen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+msgid "Convert to data layer"
+msgstr "Zur Daten-Ebene konvertieren"
+
+#: ../../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:159
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "Track"
+msgstr[1] "Tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+msgid "point"
+msgid_plural "points"
+msgstr[0] "Punkt"
+msgstr[1] "Punkte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "Ein Track mit einem Punkt"
+msgstr[1] "Ein Track mit {0} Punkten"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} besteht aus {1} Track"
+msgstr[1] "{0} besteht aus {1} Tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} Punkt"
+msgstr[1] "{0} Punkte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+msgid "Customize line drawing"
+msgstr "Linen aussehen anpassen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Use global settings."
+msgstr "Globale Einstellungen benutzen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+msgid "Draw lines between points for this layer."
+msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Do not draw lines between points for this layer."
+msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+msgid "Select line drawing options"
+msgstr "Wähle die Zeichen-Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Import images"
+msgstr "Bilder importieren"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG Bilder (*.jpg)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder für {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr "Lese GPS..."
+
+#: ../../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}"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+msgid "No images with readable timestamps found."
+msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lese {0} ...."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr "Bilder mit Ortsbezug"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Start: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Ende: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Momentaner Unterschied {0}s"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr "Zeitzonen Unterschied: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] "Bild"
+msgstr[1] "Bilder"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innerhalb des Tracks."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr "Uhrzeit Synchronisieren"
+
+#: ../../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."
+
+#: ../../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}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr "Bild"
+
+#: ../../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)"
+
+#: ../../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)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr "Zeit mit GPS Gerät synchronisieren"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../../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"
@@ -66,7 +455,7 @@
 msgstr[1] "Knotenpunkte"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
 #: ../../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"
@@ -74,7 +463,7 @@
 msgstr[1] "Abschnitte"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../../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"
@@ -82,24 +471,875 @@
 msgstr[1] "Wege"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+#: ../../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/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/download/BookmarkSelection.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../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/command/AddCommand.java:52
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../../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/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/DownloadDialog.java:75
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+#, fuzzy
+msgid "Download as new layer"
+msgstr "Hole {0} Abschnitt"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:110
+#, fuzzy
+msgid "Download Area"
+msgstr "Daten laden?"
+
+#: ../../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:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} Objekt hat Konflikte:"
+msgstr[1] "{0} Objekte haben Konflikte:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
+msgid "my version:"
+msgstr "meine Version:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
+msgid "their version:"
+msgstr "deren Version:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
+msgid "resolved version:"
+msgstr "neue Version:"
+
+#: ../../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/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../../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/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../../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/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:334
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../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/dialogs/PropertiesDialog.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+msgid "Please select the row to delete."
+msgstr "Bitte wählen Sie die löschende Zeile."
+
+#: ../../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/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/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/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/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
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+msgid "Object"
+msgstr "Objekt"
+
+#: ../../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:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+msgid "Not implemented yet."
+msgstr "Noch nicht fertig."
+
+#: ../../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/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/LayerListPopup.java:25
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Breite/Länge"
+
+#: ../../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/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:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Bilder für {0}"
+
+#: ../../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/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Verhalten und Aussehen"
+
+#: ../../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 ""
+"Wenn Ihr GPS Gerät zu wenig Linien zeichnet, sollten diese Option gewählt "
+"werden um die Linien entlang des Weges zu vervollständigen."
+
+#: ../../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/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>Import Spezifikation. Länge/Breite und Zeit wird importiert<br><b>lat</"
+"b>:Die Längen Koordinatenangabe<br><b>lon</b>: Die Breiten "
+"Koordinatenangabe<br><b>time</b>: Die gemessene Zeit als "
+"Zeichenkette<br><b>ignore</b>: Lasse dieses Feld aus<br> Ein Beispiel: "
+"\"ignore ignore lat lon\" wird ' ' als Trennzeichen, läßt die ersten zwei "
+"Werte aus und ließt dann Länge und Breite.<br>Anderes Beispiel: \"lat,lon\" "
+"ließt einfach die Länge und Breite durch Komma getrennt.</html>"
+
+#: ../../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/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"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
+msgid "OSM username (email)"
+msgstr "OSM-Benutzername (E-Mail)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
+msgid "OSM password"
+msgstr "OSM Passwort"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
+"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
+"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/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/ColorPreference.java:49
+msgid "Color"
+msgstr "Farbe"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Name"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:120
+msgid "Choose"
+msgstr "Wähle"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:124
+msgid "Please select a color."
+msgstr "Bitte eine Farbe wählen."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:129
+#, 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:134
+msgid "Colors used by different objects in JOSM."
+msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
+msgid "Colors"
+msgstr "Farben"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+msgid "background"
+msgstr "Hintergrund"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
 msgid "incomplete way"
 msgstr "unvollständiger Weg"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "selected"
 msgstr "gewählt"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "gps point"
 msgstr "GPS Punkt"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr "Konflikt"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "scale"
 msgstr "Skala"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+msgid "inactive"
+msgstr ""
+
+#: ../../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
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../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: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/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/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "verschieden"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "von"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "Position"
+
+#: ../../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/ToConflict.java:19
+msgid "to"
+msgstr "bis"
+
+#: ../../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/data/ServerSidePreferences.java:77
@@ -117,23 +1357,19 @@
 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/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."
 
 #: ../../core/src/org/openstreetmap/josm/Main.java:227
@@ -177,110 +1413,318 @@
 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/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Ändere"
+
+#: ../../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/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+msgid "Move"
+msgstr "Verschieben"
+
+#: ../../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/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Abfolge"
+
+#: ../../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/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/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/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/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/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Passwort oder Benutzername falsch."
+
+#: ../../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/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/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Fehler beim parsen."
+
+#: ../../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/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/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/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/SaveAction.java:23
@@ -292,4 +1736,110 @@
 msgstr "Speichere die aktuellen Daten."
 
+#: ../../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/search/SelectionWebsiteLoader.java:32
+msgid "Load Selection"
+msgstr "Lade Auswahl"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
+#, java-format
+msgid "Contact {0}..."
+msgstr "Verbinde zu {0} ..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
+msgid "Downloading..."
+msgstr "Lade Daten ..."
+
+#: ../../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"
+
+#: ../../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."
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Volltext suche. <ul> <li><code>Hausbrucher Straße</code>  - "
+"'Hausbrucher' and 'Straße' in jedem Schlüssel oder Wert.</li> <li><code>"
+"\"Hausbrucher Straße\"</code> - 'Hausbrucher Straße'  in jedem Schlüssel "
+"oder Wert.</li> <li><code>name:Haus</code>  'Haus' irgendwo im Namen</li> "
+"<li><code>-name:Haus</code>  kein 'Haus' in dem Namen.</li> <li><code>Bla:</"
+"code> - ein Objekt mit Schlüssel  'Bla' und irgend einen Wert</li></ul></"
+"html>"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
+msgid "replace selection"
+msgstr "Auswahl ersetzen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+msgid "add to selection"
+msgstr "zur Auswahl hinzufügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+msgid "remove from selection"
+msgstr "aus der Auswahl entfernen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../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:65
+#, 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/AutoScaleAction.java:23
 msgid "data"
@@ -314,107 +1864,57 @@
 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/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/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/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/AddNodeAction.java:48
@@ -448,4 +1948,13 @@
 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/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/SelectionAction.java:73
@@ -531,68 +2040,4 @@
 msgstr "Neuen Weg erstellen"
 
-#: ../../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"
@@ -604,29 +2049,11 @@
 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/UndoAction.java:23
+msgid "Undo"
+msgstr "Rückgängig"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Letzte Aktion zurücknehmen."
 
 #: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
@@ -648,4 +2075,108 @@
 msgstr "Richtung ändern"
 
+#: ../../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/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/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: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: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/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
@@ -656,11 +2187,11 @@
 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/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/GpxExportAction.java:40
@@ -739,124 +2270,17 @@
 msgstr "Wähle eine vordefinierte Lizenz"
 
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo"
-msgstr "Rückgängig"
-
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Letzte Aktion zurücknehmen."
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
-msgid "Download incomplete objects"
-msgstr "Unvollständige Objekte nachladen?"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
-msgid "Please select an incomplete way."
-msgstr "Bitte einen unvollständigen Weg auswählen."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr "{0} unvollständige Wege nachladen?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-msgid "Download?"
-msgstr "Daten laden?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
-msgid "Load Selection"
-msgstr "Lade Auswahl"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
-#, java-format
-msgid "Contact {0}..."
-msgstr "Verbinde zu {0} ..."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
-msgid "Downloading..."
-msgstr "Lade Daten ..."
-
-#: ../../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"
-
-#: ../../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."
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
-msgid ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-msgstr ""
-"<html>Volltext suche. <ul> <li><code>Hausbrucher Straße</code>  - "
-"'Hausbrucher' and 'Straße' in jedem Schlüssel oder Wert.</li> <li><code>"
-"\"Hausbrucher Straße\"</code> - 'Hausbrucher Straße'  in jedem Schlüssel "
-"oder Wert.</li> <li><code>name:Haus</code>  'Haus' irgendwo im Namen</li> "
-"<li><code>-name:Haus</code>  kein 'Haus' in dem Namen.</li> <li><code>Bla:</"
-"code> - ein Objekt mit Schlüssel  'Bla' und irgend einen Wert</li></ul></"
-"html>"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-msgid "replace selection"
-msgstr "Auswahl ersetzen"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-msgid "add to selection"
-msgstr "zur Auswahl hinzufügen"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-msgid "remove from selection"
-msgstr "aus der Auswahl entfernen"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-msgid "case sensitive"
-msgstr ""
+#: ../../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/SaveActionBase.java:59
@@ -896,4 +2320,175 @@
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
+
+#: ../../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/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/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/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/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/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/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/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/downloadtasks/DownloadOsmTask.java:30
+msgid "Downloading data"
+msgstr "Lade Daten aus dem Internet"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:43
+msgid "No data imported."
+msgstr "Keine Daten importiert."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Data Layer"
+msgstr "Daten-Ebene"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:56
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+msgid "Downloading GPS data"
+msgstr "Hole GPS-Daten"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:68
+msgid "Raw GPS data"
+msgstr "Roh GPS-Daten"
+
+#: ../../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/SplitWayAction.java:101
@@ -994,1661 +2589,159 @@
 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"
+#: ../../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"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
+msgid "Download incomplete objects"
+msgstr "Unvollständige Objekte nachladen?"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
+msgid "Please select an incomplete way."
+msgstr "Bitte einen unvollständigen Weg auswählen."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "{0} unvollständige Wege nachladen?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+msgid "Download?"
+msgstr "Daten laden?"
+
+#: ../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"
+
+#: ../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:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Roh GPS-Daten"
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+#, fuzzy
+msgid "Way 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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
-msgid "Convert to data layer"
-msgstr "Zur Daten-Ebene konvertieren"
-
-#: ../../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"
-msgstr[0] "Track"
-msgstr[1] "Tracks"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgid "point"
-msgid_plural "points"
-msgstr[0] "Punkt"
-msgstr[1] "Punkte"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "Ein Track mit einem Punkt"
-msgstr[1] "Ein Track mit {0} Punkten"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} besteht aus {1} Track"
-msgstr[1] "{0} besteht aus {1} Tracks"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} Punkt"
-msgstr[1] "{0} Punkte"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Customize line drawing"
-msgstr "Linen aussehen anpassen"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
-msgid "Use global settings."
-msgstr "Globale Einstellungen benutzen."
-
-#: ../../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."
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
-msgid "Select line drawing options"
-msgstr "Wähle die Zeichen-Einstellungen"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
-msgid "Import images"
-msgstr "Bilder importieren"
-
-#: ../../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)"
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr "Lese GPS..."
-
-#: ../../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}"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
-msgid "No images with readable timestamps found."
-msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lese {0} ...."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr "Bilder mit Ortsbezug"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Start: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Ende: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Momentaner Unterschied {0}s"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr "Zeitzonen Unterschied: "
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] "Bild"
-msgstr[1] "Bilder"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innerhalb des Tracks."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr "Uhrzeit Synchronisieren"
-
-#: ../../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."
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr "Bild"
-
-#: ../../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)"
-
-#: ../../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)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr "Zeit mit GPS Gerät synchronisieren"
-
-#: ../../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."
-
-#: ../../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...."
-
-#: ../../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:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} Objekt hat Konflikte:"
-msgstr[1] "{0} Objekte haben Konflikte:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "my version:"
-msgstr "meine Version:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
-msgid "their version:"
-msgstr "deren Version:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
-msgid "resolved version:"
-msgstr "neue Version:"
-
-#: ../../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</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-msgstr ""
-"<html>Import Spezifikation. Länge/Breite und Zeit wird importiert<br><b>lat</"
-"b>:Die Längen Koordinatenangabe<br><b>lon</b>: Die Breiten "
-"Koordinatenangabe<br><b>time</b>: Die gemessene Zeit als "
-"Zeichenkette<br><b>ignore</b>: Lasse dieses Feld aus<br> Ein Beispiel: "
-"\"ignore ignore lat lon\" wird ' ' als Trennzeichen, läßt die ersten zwei "
-"Werte aus und ließt dann Länge und Breite.<br>Anderes Beispiel: \"lat,lon\" "
-"ließt einfach die Länge und Breite durch Komma getrennt.</html>"
-
-#: ../../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 ""
-"Wenn Ihr GPS Gerät zu wenig Linien zeichnet, sollten diese Option gewählt "
-"werden um die Linien entlang des Weges zu vervollständigen."
-
-#: ../../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"
+#: ../livegps/livegps/LiveGpsDialog.java:51
+#: ../grid/src/grid/GridLayer.java:193
+msgid "Latitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#: ../grid/src/grid/GridLayer.java:195
+msgid "Longitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:57
+#, fuzzy
+msgid "Course"
 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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
-msgid "Colors"
-msgstr "Farben"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
-msgid "OSM username (email)"
-msgstr "OSM-Benutzername (E-Mail)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "OSM password"
-msgstr "OSM Passwort"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
-
-#: ../../core/src/org/openstreetmap/josm/gui/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"
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
 msgstr ""
 
@@ -2666,4 +2759,62 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 #, fuzzy
@@ -2671,358 +2822,32 @@
 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."
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+#, fuzzy
+msgid "WMS Plugin Preferences"
 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/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"
+
+#: ../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/WMSPlugin.java:97
@@ -3030,32 +2855,27 @@
 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"
+#: ../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."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
 
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
@@ -3086,4 +2906,10 @@
 msgstr ""
 
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "Letzte Änderung am {0}"
+
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
@@ -3127,8 +2953,299 @@
 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 ""
+#: ../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/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/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"
+
+#: ../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/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/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/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/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/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/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/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/ValidatorDialog.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+msgid "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:63
+msgid "Data validator"
+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 ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "Weg"
 
 #: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
@@ -3153,10 +3270,64 @@
 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
+#: ../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."
+
+#: ../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 ""
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+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"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:56
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
@@ -3171,119 +3342,13 @@
 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."
-
-#: ../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/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Datei öffnen."
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Datei öffnen."
 
 #: ../waypoints/src/WaypointReader.java:55
@@ -3296,52 +3361,4 @@
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
-
-#: ../waypoints/src/WaypointOpenAction.java:33
-#, fuzzy
-msgid "Open waypoints file"
-msgstr "Datei öffnen."
-
-#: ../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"
Index: /applications/editors/josm/plugins/lang/en_GB/en_GB.po
===================================================================
--- /applications/editors/josm/plugins/lang/en_GB/en_GB.po	(revision 3995)
+++ /applications/editors/josm/plugins/lang/en_GB/en_GB.po	(revision 3996)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 14:05+0200\n"
+"POT-Creation-Date: 2007-08-07 23:37+0200\n"
 "PO-Revision-Date: 14/10/2006 18:36+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -17,48 +17,436 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../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/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/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/MainApplet.java:78
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+msgid "Username"
+msgstr "Username"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+msgid "Password"
+msgstr "Password"
+
+#: ../../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/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+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:76
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+msgid "Help"
+msgstr "Help"
+
+#: ../../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/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/PleaseWaitDialog.java:23
+msgid "Contacting the OSM server..."
+msgstr "Contacting the OSM server..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../../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:142
+#, 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/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/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/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/MarkerLayer.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr "OK"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Default"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+msgid "Convert to data layer"
+msgstr "Convert to data layer"
+
+#: ../../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:159
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "track"
+msgstr[1] "tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+msgid "point"
+msgid_plural "points"
+msgstr[0] "point"
+msgstr[1] "points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "a track with {0} point"
+msgstr[1] "a track with {0} points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} consists of {1} track"
+msgstr[1] "{0} consists of {1} tracks"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Use global settings."
+msgstr "Use global settings."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Import images"
+msgstr "Import images"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG images (*.jpg)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr "Images for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr "Read GPS..."
+
+#: ../../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}"
+
+#: ../../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}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+msgid "No images with readable timestamps found."
+msgstr "No images with readable timestamps found."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr "Reading {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr "Geotagged Images"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS end: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr "current delta: {0}s"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr "timezone difference: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} within the track."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr "Sync clock"
+
+#: ../../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."
+
+#: ../../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}\"."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr "Image"
+
+#: ../../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)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+msgid "GPS unit timezome (difference to photo)"
+msgstr "GPS unit timezome (difference to photo)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr "Synchronise Time with GPS Unit"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../../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"
@@ -66,7 +454,7 @@
 msgstr[1] "nodes"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
 #: ../../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"
@@ -74,7 +462,7 @@
 msgstr[1] "segments"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../../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"
@@ -82,24 +470,866 @@
 msgstr[1] "ways"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+#: ../../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/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/download/BookmarkSelection.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../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/command/AddCommand.java:52
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+msgid "Add"
+msgstr "Add"
+
+#: ../../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/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/DownloadDialog.java:75
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+#, fuzzy
+msgid "Download as new layer"
+msgstr "Downloading {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:110
+#, fuzzy
+msgid "Download Area"
+msgstr "Download?"
+
+#: ../../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:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} object has conflicts:"
+msgstr[1] "{0} objects have conflicts:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
+msgid "my version:"
+msgstr "my version:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
+msgid "their version:"
+msgstr "their version:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
+msgid "resolved version:"
+msgstr "resolved version:"
+
+#: ../../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/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../../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/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+msgid "Delete"
+msgstr "Delete"
+
+#: ../../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/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:334
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../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/dialogs/PropertiesDialog.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: ../../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/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/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/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/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
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+msgid "Object"
+msgstr "Object"
+
+#: ../../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:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+msgid "Not implemented yet."
+msgstr "Not implemented yet."
+
+#: ../../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/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/LayerListPopup.java:25
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../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/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:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Images for {0}"
+
+#: ../../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/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Look and Feel"
+
+#: ../../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."
+
+#: ../../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/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+
+#: ../../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/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"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
+msgid "OSM username (email)"
+msgstr "OSM username (email)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
+msgid "OSM password"
+msgstr "OSM password"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+
+#: ../../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/ColorPreference.java:49
+msgid "Color"
+msgstr "Colour"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Name"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:120
+msgid "Choose"
+msgstr "Choose"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:124
+msgid "Please select a color."
+msgstr "Please select a colour."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:129
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choose a colour for {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
+msgid "Colors used by different objects in JOSM."
+msgstr "Colours used by different objects in JOSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
+msgid "Colors"
+msgstr "Colours"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+msgid "background"
+msgstr "background"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
 msgid "incomplete way"
 msgstr "incomplete way"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "selected"
 msgstr "selected"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "gps point"
 msgstr "gps point"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr "conflict"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "scale"
 msgstr "scale"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+msgid "inactive"
+msgstr ""
+
+#: ../../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
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../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: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/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/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "different"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "from"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "position"
+
+#: ../../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/ToConflict.java:19
+msgid "to"
+msgstr "to"
+
+#: ../../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/data/ServerSidePreferences.java:77
@@ -117,23 +1347,19 @@
 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/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}"
 
 #: ../../core/src/org/openstreetmap/josm/Main.java:227
@@ -174,110 +1400,315 @@
 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/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Change"
+
+#: ../../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/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+msgid "Move"
+msgstr "Move"
+
+#: ../../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/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Sequence"
+
+#: ../../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/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/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/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/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/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Incorrect password or username."
+
+#: ../../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/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/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Error during parse."
+
+#: ../../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/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/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/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/SaveAction.java:23
@@ -289,4 +1720,107 @@
 msgstr "Save the current data."
 
+#: ../../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/search/SelectionWebsiteLoader.java:32
+msgid "Load Selection"
+msgstr "Load Selection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contact {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
+msgid "Downloading..."
+msgstr "Downloading..."
+
+#: ../../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}\""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr "Parsing error in url: \"{0}\""
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
+msgid "replace selection"
+msgstr "replace selection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+msgid "add to selection"
+msgstr "add to selection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+msgid "remove from selection"
+msgstr "remove from selection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../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:65
+#, 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/AutoScaleAction.java:23
 msgid "data"
@@ -311,107 +1845,57 @@
 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/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/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/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/AddNodeAction.java:48
@@ -445,4 +1929,12 @@
 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/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/SelectionAction.java:73
@@ -529,67 +2021,4 @@
 msgstr "Create new way"
 
-#: ../../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"
@@ -601,29 +2030,11 @@
 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/UndoAction.java:23
+msgid "Undo"
+msgstr "Undo"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Undo the last action."
 
 #: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
@@ -645,4 +2056,108 @@
 msgstr "Reverse Segments"
 
+#: ../../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/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/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: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: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/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
@@ -653,11 +2168,11 @@
 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/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/GpxExportAction.java:40
@@ -736,121 +2251,17 @@
 msgstr "Choose a predefined license"
 
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo"
-msgstr "Undo"
-
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Undo the last action."
-
-#: ../../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"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
-msgid "Please select an incomplete way."
-msgstr "Please select an incomplete way."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr "Download {0} incomplete ways?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-msgid "Download?"
-msgstr "Download?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
-msgid "Load Selection"
-msgstr "Load Selection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
-#, java-format
-msgid "Contact {0}..."
-msgstr "Contact {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
-msgid "Downloading..."
-msgstr "Downloading..."
-
-#: ../../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}\""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
-#, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr "Parsing error in url: \"{0}\""
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
-msgid ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-msgstr ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-msgid "replace selection"
-msgstr "replace selection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-msgid "add to selection"
-msgstr "add to selection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-msgid "remove from selection"
-msgstr "remove from selection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-msgid "case sensitive"
-msgstr ""
+#: ../../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/SaveActionBase.java:59
@@ -890,4 +2301,175 @@
 msgid "An error occurred while saving."
 msgstr "An error occoured while saving."
+
+#: ../../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/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/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/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/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/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/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/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/downloadtasks/DownloadOsmTask.java:30
+msgid "Downloading data"
+msgstr "Downloading data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:43
+msgid "No data imported."
+msgstr "No data imported."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Data Layer"
+msgstr "Data Layer"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:56
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+msgid "Downloading GPS data"
+msgstr "Downloading GPS data"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:68
+msgid "Raw GPS data"
+msgstr "Raw GPS data"
+
+#: ../../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/SplitWayAction.java:101
@@ -987,1648 +2569,159 @@
 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"
+#: ../../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"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
+msgid "Please select an incomplete way."
+msgstr "Please select an incomplete way."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Download {0} incomplete ways?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+msgid "Download?"
+msgstr "Download?"
+
+#: ../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"
+
+#: ../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:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Raw GPS data"
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+#, fuzzy
+msgid "Way 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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
-msgid "Convert to data layer"
-msgstr "Convert to data layer"
-
-#: ../../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"
-msgstr[0] "track"
-msgstr[1] "tracks"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgid "point"
-msgid_plural "points"
-msgstr[0] "point"
-msgstr[1] "points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "a track with {0} point"
-msgstr[1] "a track with {0} points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} consists of {1} track"
-msgstr[1] "{0} consists of {1} tracks"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} point"
-msgstr[1] "{0} points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../../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."
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
-msgid "Import images"
-msgstr "Import images"
-
-#: ../../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)"
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr "Read GPS..."
-
-#: ../../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}"
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
-msgid "No images with readable timestamps found."
-msgstr "No images with readable timestamps found."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr "Reading {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr "Geotagged Images"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS end: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr "current delta: {0}s"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr "timezone difference: "
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} within the track."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr "Sync clock"
-
-#: ../../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."
-
-#: ../../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}\"."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr "Image"
-
-#: ../../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)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
-msgid "GPS unit timezome (difference to photo)"
-msgstr "GPS unit timezome (difference to photo)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr "Synchronise Time with GPS Unit"
-
-#: ../../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."
-
-#: ../../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..."
-
-#: ../../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:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} object has conflicts:"
-msgstr[1] "{0} objects have conflicts:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "my version:"
-msgstr "my version:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
-msgid "their version:"
-msgstr "their version:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
-msgid "resolved version:"
-msgstr "resolved version:"
-
-#: ../../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</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-msgstr ""
-"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-
-#: ../../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."
-
-#: ../../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"
+#: ../livegps/livegps/LiveGpsDialog.java:51
+#: ../grid/src/grid/GridLayer.java:193
+msgid "Latitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#: ../grid/src/grid/GridLayer.java:195
+msgid "Longitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:57
+#, fuzzy
+msgid "Course"
 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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
-msgid "Colors"
-msgstr "Colours"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
-msgid "OSM username (email)"
-msgstr "OSM username (email)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "OSM password"
-msgstr "OSM password"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-
-#: ../../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"
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
 msgstr ""
 
@@ -2646,4 +2739,62 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 #, fuzzy
@@ -2651,362 +2802,21 @@
 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/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"
 
 #: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
@@ -3019,21 +2829,30 @@
 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"
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
+msgid "WMS"
+msgstr ""
+
+#: ../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."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
 
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
@@ -3064,4 +2883,10 @@
 msgstr ""
 
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "last change at {0}"
+
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
@@ -3103,8 +2928,299 @@
 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 ""
+#: ../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/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/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"
+
+#: ../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/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/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/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Remove \"{0}\" for"
+
+#: ../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/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/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/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/ValidatorDialog.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+msgid "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:63
+msgid "Data validator"
+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 ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "way"
 
 #: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
@@ -3129,10 +3245,64 @@
 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
+#: ../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."
+
+#: ../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 ""
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+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"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:56
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
@@ -3147,118 +3317,13 @@
 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."
-
-#: ../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/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Open a file."
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Open a file."
 
 #: ../waypoints/src/WaypointReader.java:55
@@ -3271,52 +3336,4 @@
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Data error: lon value \"{0}\" is out of bound."
-
-#: ../waypoints/src/WaypointOpenAction.java:33
-#, fuzzy
-msgid "Open waypoints file"
-msgstr "Open a file."
-
-#: ../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"
Index: /applications/editors/josm/plugins/lang/fr/fr.po
===================================================================
--- /applications/editors/josm/plugins/lang/fr/fr.po	(revision 3995)
+++ /applications/editors/josm/plugins/lang/fr/fr.po	(revision 3996)
@@ -7,5 +7,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 14:05+0200\n"
+"POT-Creation-Date: 2007-08-07 23:37+0200\n"
 "PO-Revision-Date: 2006-10-14 12:17+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -16,48 +16,438 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../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/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/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/MainApplet.java:78
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../../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/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+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:76
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+msgid "Help"
+msgstr "Aide"
+
+#: ../../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/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/PleaseWaitDialog.java:23
+msgid "Contacting the OSM server..."
+msgstr "Contact du serveur OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../../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:142
+#, 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/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/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/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/MarkerLayer.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+msgid "Customize Color"
+msgstr "Personnaliser la couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr "OK"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choisir une couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+msgid "Convert to data layer"
+msgstr "Convertir en un calque de données"
+
+#: ../../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:159
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "trace"
+msgstr[1] "traces"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+msgid "point"
+msgid_plural "points"
+msgstr[0] "point"
+msgstr[1] "points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "une trace avec {0} point"
+msgstr[1] "une trace avec {0} points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} consiste en {1} trace"
+msgstr[1] "{0} consiste en {1} traces"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+msgid "Customize line drawing"
+msgstr "Personnaliser le dessin des lignes"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Use global settings."
+msgstr "Utiliser les réglages généraux."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+msgid "Draw lines between points for this layer."
+msgstr "Dessiner des lignes entre les points pour ce calque."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Do not draw lines between points for this layer."
+msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+msgid "Select line drawing options"
+msgstr "Options de dessin des lignes"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Import images"
+msgstr "Import des images"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+msgid "JPEG images (*.jpg)"
+msgstr "images JPEG (*.jpg)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr "Images pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr "Lecture du GPS..."
+
+#: ../../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}"
+
+#: ../../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}"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lecture de {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr "Images géomarquées"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Allumage du GPS : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Extinction du GPS : {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr "variation actuelle : {0}s"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr "différence de fuseau horaire : "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dans la trace."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr "Synchroniser l'horloge"
+
+#: ../../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."
+
+#: ../../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}\"."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr "Image"
+
+#: ../../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)"
+
+#: ../../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)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr "Synchroniser l'heure avec l'unité GPS"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../../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"
@@ -65,7 +455,7 @@
 msgstr[1] "noeuds"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
 #: ../../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"
@@ -73,7 +463,7 @@
 msgstr[1] "segments"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../../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"
@@ -81,24 +471,874 @@
 msgstr[1] "chemins"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+#: ../../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/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/download/BookmarkSelection.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../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/command/AddCommand.java:52
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../../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/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/DownloadDialog.java:75
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+#, fuzzy
+msgid "Download as new layer"
+msgstr "TÃÂÃÂ©lÃÂÃÂ©chargement {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:110
+#, fuzzy
+msgid "Download Area"
+msgstr "Télécharger ?"
+
+#: ../../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:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} objet est conflictuel : "
+msgstr[1] "{0} objets sont conflictuels :"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
+msgid "my version:"
+msgstr "ma version :"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
+msgid "their version:"
+msgstr "version du serveur : "
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
+msgid "resolved version:"
+msgstr "version choisie : "
+
+#: ../../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/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../../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/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../../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/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:334
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../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/dialogs/PropertiesDialog.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+msgid "Please select the row to delete."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: ../../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/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/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/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/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
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+msgid "Object"
+msgstr "Objet"
+
+#: ../../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:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+msgid "Not implemented yet."
+msgstr "Pas encore implémenté."
+
+#: ../../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/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/LayerListPopup.java:25
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+msgid "Info"
+msgstr "Info"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../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/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:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Images pour {0}"
+
+#: ../../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/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Apparence et comportement"
+
+#: ../../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 ""
+"Si votre unité GPS dessine trop peu de lignes, sélectionnez ceci pour "
+"dessiner des lignes le long de votre chemin."
+
+#: ../../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/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>Import des spécifications. lat/lon et time sont importés.<br><b>lat</"
+"b> : la latitude<br><b>lon</b> :la longitude<br><b>time</b> :l'heure "
+"mesurée<br><b>ignore</b>:·sauter ce champ<br>Un exemple : "
+"\"ignore·ignore·lat·lon\"·utilisera·'·'·comme délimiteur, sautera les deux "
+"premières valeurs, et lira ensuite la latitude et la longitude<br>Un autre "
+"exemple : \"lat,lon\"·lira simplement la latitude et la longitude séparées "
+"par une virgule.</html>"
+
+#: ../../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/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"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
+msgid "OSM username (email)"
+msgstr "Nom d'utilisateur OSM (e-mail)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
+msgid "OSM password"
+msgstr "Mot de passe OSM"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
+"de préférences.<br>Le mot de passe est transféré en texte brut au serveur, "
+"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid "Display Settings"
+msgstr "Réglages d'affichage"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr "Divers réglages de l'apparence de tout le programme."
+
+#: ../../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/ColorPreference.java:49
+msgid "Color"
+msgstr "Couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Nom"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:120
+msgid "Choose"
+msgstr "Choisir"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:124
+msgid "Please select a color."
+msgstr "Sélectionner une couleur"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:129
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choisir une couleur pour {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
+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:136
+msgid "Colors"
+msgstr "Couleurs"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+msgid "background"
+msgstr "arrière plan"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
 msgid "incomplete way"
 msgstr "chemin incomplet"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "selected"
 msgstr "sélectionné"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "gps point"
 msgstr "point GPS"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr "conflit"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "scale"
 msgstr "mesure"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+msgid "inactive"
+msgstr ""
+
+#: ../../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
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../../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: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/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/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "différent"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "à"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "position"
+
+#: ../../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/ToConflict.java:19
+msgid "to"
+msgstr "depuis"
+
+#: ../../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/data/ServerSidePreferences.java:77
@@ -118,23 +1358,19 @@
 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/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}"
 
 #: ../../core/src/org/openstreetmap/josm/Main.java:227
@@ -179,111 +1415,319 @@
 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/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Changer"
+
+#: ../../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/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+msgid "Move"
+msgstr "Déplacer"
+
+#: ../../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/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Séquence"
+
+#: ../../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/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/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/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/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/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: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/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/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Erreur pendant l'analyse."
+
+#: ../../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/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/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/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/SaveAction.java:23
@@ -295,4 +1739,108 @@
 msgstr "Sauvegarder les données actuelles"
 
+#: ../../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/search/SelectionWebsiteLoader.java:32
+msgid "Load Selection"
+msgstr "Charger la sélection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contact de {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
+msgid "Downloading..."
+msgstr "Téléchargement..."
+
+#: ../../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}\""
+
+#: ../../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}\""
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Recherche du texte entier<ul><li><code>Baker·Street</code>··-"
+"·'Baker'·et·'Street'·dans les clés et les noms.</li><li><code>\"Baker·Street"
+"\"</code>··-·'Baker·Street'·dans les clés et les noms.</li><li><code>name:"
+"Bak</code>··-·'Bak'·n'importe où dans le nom.</li><li><code>-name:Bak</"
+"code>··-·pas de·'Bak'·dans le nom.</li><li><code>foot:</code>··-"
+"·key=foot·associé à n'importe quelle valeur.</ul></html>"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
+msgid "replace selection"
+msgstr "remplacer la sélection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+msgid "add to selection"
+msgstr "ajouter à la sélection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+msgid "remove from selection"
+msgstr "supprimer de la sélection"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../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:65
+#, 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/AutoScaleAction.java:23
 msgid "data"
@@ -317,108 +1865,57 @@
 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/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/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/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/AddNodeAction.java:48
@@ -452,4 +1949,12 @@
 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/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/SelectionAction.java:73
@@ -539,67 +2044,4 @@
 msgstr "Créer un nouveau chemin"
 
-#: ../../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"
@@ -613,29 +2055,11 @@
 "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/UndoAction.java:23
+msgid "Undo"
+msgstr "Annuler"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Annuler la dernière action."
 
 #: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
@@ -657,4 +2081,109 @@
 msgstr "Retourne les segments."
 
+#: ../../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/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/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: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: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/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
@@ -665,11 +2194,11 @@
 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/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/GpxExportAction.java:40
@@ -748,123 +2277,17 @@
 msgstr "Choisir une licence prédéfinie"
 
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo"
-msgstr "Annuler"
-
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Annuler la dernière action."
-
-#: ../../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"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
-msgid "Please select an incomplete way."
-msgstr "Sélectionner un chemin incomplet"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr "Télécharger {0} chemins incomplets ?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-msgid "Download?"
-msgstr "Télécharger ?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
-msgid "Load Selection"
-msgstr "Charger la sélection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
-#, java-format
-msgid "Contact {0}..."
-msgstr "Contact de {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
-msgid "Downloading..."
-msgstr "Téléchargement..."
-
-#: ../../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}\""
-
-#: ../../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}\""
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
-msgid ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-msgstr ""
-"<html>Recherche du texte entier<ul><li><code>Baker·Street</code>··-"
-"·'Baker'·et·'Street'·dans les clés et les noms.</li><li><code>\"Baker·Street"
-"\"</code>··-·'Baker·Street'·dans les clés et les noms.</li><li><code>name:"
-"Bak</code>··-·'Bak'·n'importe où dans le nom.</li><li><code>-name:Bak</"
-"code>··-·pas de·'Bak'·dans le nom.</li><li><code>foot:</code>··-"
-"·key=foot·associé à n'importe quelle valeur.</ul></html>"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-msgid "replace selection"
-msgstr "remplacer la sélection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-msgid "add to selection"
-msgstr "ajouter à la sélection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-msgid "remove from selection"
-msgstr "supprimer de la sélection"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-msgid "case sensitive"
-msgstr ""
+#: ../../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/SaveActionBase.java:59
@@ -904,4 +2327,178 @@
 msgid "An error occurred while saving."
 msgstr "Une erreur s'est produite pendant la sauvegarde."
+
+#: ../../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/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/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/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/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/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/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/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/downloadtasks/DownloadOsmTask.java:30
+msgid "Downloading data"
+msgstr "Téléchargement des données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:43
+msgid "No data imported."
+msgstr "Aucune donnée importée"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Data Layer"
+msgstr "Calque de données"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:56
+msgid "OpenStreetMap data"
+msgstr "Données OpenStreetMap"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+msgid "Downloading GPS data"
+msgstr "Téléchargement des données GPS"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:68
+msgid "Raw GPS data"
+msgstr "Données GPS brutes"
+
+#: ../../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/SplitWayAction.java:101
@@ -1002,1664 +2599,160 @@
 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"
+#: ../../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"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
+msgid "Please select an incomplete way."
+msgstr "Sélectionner un chemin incomplet"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Télécharger {0} chemins incomplets ?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+msgid "Download?"
+msgstr "Télécharger ?"
+
+#: ../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"
+
+#: ../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:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Données GPS brutes"
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+#, fuzzy
+msgid "Way 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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
-msgid "Convert to data layer"
-msgstr "Convertir en un calque de données"
-
-#: ../../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"
-msgstr[0] "trace"
-msgstr[1] "traces"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgid "point"
-msgid_plural "points"
-msgstr[0] "point"
-msgstr[1] "points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "une trace avec {0} point"
-msgstr[1] "une trace avec {0} points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} consiste en {1} trace"
-msgstr[1] "{0} consiste en {1} traces"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} point"
-msgstr[1] "{0} points"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Customize line drawing"
-msgstr "Personnaliser le dessin des lignes"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../../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."
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
-msgid "Select line drawing options"
-msgstr "Options de dessin des lignes"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
-msgid "Import images"
-msgstr "Import des images"
-
-#: ../../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)"
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr "Lecture du GPS..."
-
-#: ../../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}"
-
-#: ../../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}"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lecture de {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr "Images géomarquées"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Allumage du GPS : {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Extinction du GPS : {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr "variation actuelle : {0}s"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr "différence de fuseau horaire : "
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dans la trace."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr "Synchroniser l'horloge"
-
-#: ../../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."
-
-#: ../../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}\"."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr "Image"
-
-#: ../../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)"
-
-#: ../../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)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr "Synchroniser l'heure avec l'unité GPS"
-
-#: ../../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."
-
-#: ../../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..."
-
-#: ../../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:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} objet est conflictuel : "
-msgstr[1] "{0} objets sont conflictuels :"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "my version:"
-msgstr "ma version :"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
-msgid "their version:"
-msgstr "version du serveur : "
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
-msgid "resolved version:"
-msgstr "version choisie : "
-
-#: ../../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</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-msgstr ""
-"<html>Import des spécifications. lat/lon et time sont importés.<br><b>lat</"
-"b> : la latitude<br><b>lon</b> :la longitude<br><b>time</b> :l'heure "
-"mesurée<br><b>ignore</b>:·sauter ce champ<br>Un exemple : "
-"\"ignore·ignore·lat·lon\"·utilisera·'·'·comme délimiteur, sautera les deux "
-"premières valeurs, et lira ensuite la latitude et la longitude<br>Un autre "
-"exemple : \"lat,lon\"·lira simplement la latitude et la longitude séparées "
-"par une virgule.</html>"
-
-#: ../../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 ""
-"Si votre unité GPS dessine trop peu de lignes, sélectionnez ceci pour "
-"dessiner des lignes le long de votre chemin."
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr "Divers réglages de l'apparence de tout le programme."
-
-#: ../../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"
+#: ../livegps/livegps/LiveGpsDialog.java:51
+#: ../grid/src/grid/GridLayer.java:193
+msgid "Latitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#: ../grid/src/grid/GridLayer.java:195
+msgid "Longitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:57
+#, fuzzy
+msgid "Course"
 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"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
-msgid "OSM username (email)"
-msgstr "Nom d'utilisateur OSM (e-mail)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "OSM password"
-msgstr "Mot de passe OSM"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
-"de préférences.<br>Le mot de passe est transféré en texte brut au serveur, "
-"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
-
-#: ../../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"
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
 msgstr ""
 
@@ -2677,4 +2770,62 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 #, fuzzy
@@ -2682,358 +2833,32 @@
 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/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"
+
+#: ../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/WMSPlugin.java:97
@@ -3041,32 +2866,27 @@
 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"
+#: ../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."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
 
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
@@ -3097,4 +2917,10 @@
 msgstr ""
 
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "dernier changement le {0}"
+
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
@@ -3136,8 +2962,299 @@
 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 ""
+#: ../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/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/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"
+
+#: ../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/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/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/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Supprime \"{0}\" pour"
+
+#: ../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/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/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/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/ValidatorDialog.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+msgid "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:63
+msgid "Data validator"
+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 ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "chemin"
 
 #: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
@@ -3162,10 +3279,64 @@
 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
+#: ../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."
+
+#: ../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 ""
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+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"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:56
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
@@ -3180,119 +3351,13 @@
 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."
-
-#: ../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/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Ouvrir un fichier"
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Ouvrir un fichier"
 
 #: ../waypoints/src/WaypointReader.java:55
@@ -3305,52 +3370,4 @@
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
-
-#: ../waypoints/src/WaypointOpenAction.java:33
-#, fuzzy
-msgid "Open waypoints file"
-msgstr "Ouvrir un fichier"
-
-#: ../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"
Index: /applications/editors/josm/plugins/lang/keys.pot
===================================================================
--- /applications/editors/josm/plugins/lang/keys.pot	(revision 3995)
+++ /applications/editors/josm/plugins/lang/keys.pot	(revision 3996)
@@ -9,5 +9,5 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 14:07+0200\n"
+"POT-Creation-Date: 2007-08-07 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18,48 +18,420 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:183
-msgid "background"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:184
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
+msgid "Error while parsing"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+msgid "File not found"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+msgid "Upload Preferences"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
+msgid "Upload the current preferences to the server"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
+msgid "Name of the user."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
+msgid "OSM Password."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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 ""
+
+#: ../../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 ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "any"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+msgid "Username"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+msgid "Password"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
+msgid "Layer"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+msgid "Edit"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
+#: ../osmarender/src/OsmarenderPlugin.java:98
+#: ../osmarender/src/OsmarenderPlugin.java:104
+msgid "View"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:76
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+msgid "Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
+msgid "Files"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
+msgid "Connection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
+msgid "Tools"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
+msgid "Zoom To"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
+msgid "Getting Started"
+msgstr ""
+
+#: ../../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: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/PleaseWaitDialog.java:23
+msgid "Contacting the OSM server..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "Cancel"
+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:142
+#, 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 ""
+
+#: ../../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
+msgid "Error displaying URL"
+msgstr ""
+
+#: ../../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
+msgid "Error playing sound"
+msgstr ""
+
+#: ../../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
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+msgid "Customize Color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+msgid "Convert to data layer"
+msgstr ""
+
+#: ../../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
+msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+msgid "point"
+msgid_plural "points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Use global settings."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Import images"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+msgid "JPEG images (*.jpg)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+msgid "GPS unit timezome (difference to photo)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../../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"
@@ -67,7 +439,7 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
 #: ../../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"
@@ -75,7 +447,7 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../../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"
@@ -83,37 +455,801 @@
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+#: ../../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:339
+#, java-format
+msgid "{0} consists of:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#, java-format
+msgid " ({0} deleted.)"
+msgstr ""
+
+#: ../../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:147
+msgid "layer not in list."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../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/command/AddCommand.java:52
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+msgid "Add"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:64
+msgid "Please enter the desired coordinates first."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
+msgid "Please enter a name for the location."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+msgid "Remove"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Select a bookmark first."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "min lon"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lat"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+msgid "max lon"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "URL from www.openstreetmap.org"
+msgstr ""
+
+#: ../../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/DownloadDialog.java:75
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+msgid "Download as new layer"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:110
+msgid "Download Area"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
+#, java-format
+msgid "{0} object has conflicts:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
+msgid "my version:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
+msgid "their version:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
+msgid "resolved version:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+msgid "Java OpenStreetMap Editor"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgid "usage"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+msgid "options"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+msgid "Show this help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgid "Download the bounding box"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgid "Select with the given search"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Don't launch in fullscreen mode"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "Reset the preferences to default"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
+msgid "Set the language. Example: "
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "examples"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../../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/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+msgid "Delete"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+msgid "Delete the selected layer."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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:104
+msgid "Show/Hide Text"
+msgstr ""
+
+#: ../../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:145
+msgid "Layers"
+msgstr ""
+
+#: ../../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:221
+msgid "Move the selected layer one row up."
+msgstr ""
+
+#: ../../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:241
+msgid "Merge the selected layer into the layer directly below."
+msgstr ""
+
+#: ../../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: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] ""
+msgstr[1] ""
+
+#: ../../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 ""
+
+#: ../../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:160
+#, java-format
+msgid "Change properties of {0} object"
+msgid_plural "Change properties of {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../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:183
+msgid "Please select a key"
+msgstr ""
+
+#: ../../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:278
+msgid "Properties"
+msgstr ""
+
+#: ../../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:334
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:401
+msgid "Please select the row to edit."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../../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:346
+msgid "Edit the value of the selected key for all objects"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+msgid "Delete the selected key in all objects"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Current Selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
+msgid "Open a selection list window."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Conflict"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+msgid "Merging conflicts."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Resolve"
+msgstr ""
+
+#: ../../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:74
+msgid "Select"
+msgstr ""
+
+#: ../../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:109
+msgid "Please select something from the conflict list."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "Resolve Conflicts"
+msgstr ""
+
+#: ../../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:85
+msgid "Reload"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Revert"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
+msgid "History"
+msgstr ""
+
+#: ../../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:99
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+msgid "Object"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
+msgid "Date"
+msgstr ""
+
+#: ../../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:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+msgid "Not implemented yet."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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
+msgid "# Objects"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+msgid "Info"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
+msgid "Could not read bookmarks."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
+msgid "Could not write bookmark."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
+msgid "Advanced Preferences"
+msgstr ""
+
+#: ../../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
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
+#, java-format
+msgid "New value for {0}"
+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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
+msgid "Look and Feel"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
+msgid "Draw lines between raw gps points."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+msgid "Force lines if no segments imported."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+msgid "Draw large GPS points."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+msgid "Draw Direction Arrows"
+msgstr ""
+
+#: ../../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
+msgid ""
+"If your gps device draw too few lines, select this to draw lines along your "
+"way."
+msgstr ""
+
+#: ../../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:44
+msgid "Draw larger dots for the GPS points."
+msgstr ""
+
+#: ../../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:53
+msgid "Draw the order numbers of all segments within their way."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
+msgid "The base URL for the OSM server (REST API)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgid "Login name (email) to the OSM account."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
+msgid "Base Server URL"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
+msgid "OSM username (email)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
+msgid "OSM password"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid "Display Settings"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+msgid "Connection Settings for the OSM server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Map Settings"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgid "Settings for the map projection and data interpretation."
+msgstr ""
+
+#: ../../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/ColorPreference.java:49
+msgid "Color"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:120
+msgid "Choose"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:124
+msgid "Please select a color."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:129
+#, java-format
+msgid "Choose a color for {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
+msgid "Colors used by different objects in JOSM."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
+msgid "Colors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+msgid "background"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
 msgid "incomplete way"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "selected"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "gps point"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "scale"
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
-msgid "Could not load preferences from server."
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+msgid "inactive"
+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
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+msgid "Configure available plugins."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+msgid "Get more plugins"
+msgstr ""
+
+#: ../../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
+msgid "No plugin information found."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+msgid "Update current"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+msgid "Configure Plugin Sites"
+msgstr ""
+
+#: ../../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
+#, java-format
+msgid ""
+"Download the following plugins?\n"
+"\n"
+"{0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+msgid "Download missing plugins"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
 msgstr ""
 
@@ -138,4 +1274,34 @@
 msgstr ""
 
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:80
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../../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
+#, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr ""
+
 #: ../../core/src/org/openstreetmap/josm/Main.java:227
 #, java-format
@@ -174,56 +1340,417 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
-msgid "Upload to OSM"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
-msgid "Upload all changes to the OSM server."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Objects to add:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
-msgid "Objects to modify:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
-msgid "Objects to delete:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
-msgid "Upload these changes?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Nothing to upload. Get some data first."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
-msgid "No changes to upload."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
-msgid "Uploading data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
-msgid "Rename layer"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
-#, java-format
-msgid "Could not rename the file \"{0}\"."
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr ""
+
+#: ../../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] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+msgid "Move"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
+msgid "Sequence"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr ""
+
+#: ../../core/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 ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+msgid "Maybe add a format string in preferences."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
+msgid "Downloading incomplete ways..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
+msgid "Fix data errors"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
+#, java-format
+msgid "Segment {0} is deleted but part of Way {1}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
+msgid "Data error"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+
+#: ../../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:145
+msgid "Found <seg> tag on non-way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
+msgid "Incomplete segment with id=0"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
+msgid "NullPointerException, Possibly some missing tags."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+msgid "Illegal object with id=0"
+msgstr ""
+
+#: ../../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:220
+#, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+msgid "Preparing data..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+msgid "Illformed Node id"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+msgid "Unknown host"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
+#, java-format
+msgid "Data error: lat value \"{0}\" is out of bounds."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
+#, java-format
+msgid "Data error: lon value \"{0}\" is out of bounds."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Warning: The password is transferred unencrypted."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
+msgid "Save user and password (unencrypted)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
+msgid "Enter Password"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
+msgid "Aborting..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
+msgid "Contacting OSM Server..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+msgid "Downloading OSM data..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+msgid "Report Bug"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+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 ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
+msgid "Unexpected Exception"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+
+#: ../../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/DontShowAgainInfo.java:23
+msgid "Do not show again"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
+msgid "Information"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Ctrl-"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "Alt-"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "AltGr-"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
+msgid "Shift-"
+msgstr ""
+
+#: ../../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
+msgid "Please select at least two ways to combine."
+msgstr ""
+
+#: ../../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/SaveAction.java:23
+msgid "Save"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
+msgid "Save the current data."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+msgid "New"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
+msgid "Create a new map."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:20
+msgid "unnamed"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
+msgid "Load Selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
+#, java-format
+msgid "Contact {0}..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
+msgid "Downloading..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
+#, java-format
+msgid "Could not read from url: \"{0}\""
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "Search"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
+msgid "Search for objects."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
+msgid "No data loaded."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
+msgid "Please enter a search string."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
+msgid "replace selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+msgid "add to selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+msgid "remove from selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download from OSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+msgid "Download map data from the OSM server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
+msgid "Download"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:65
+msgid "Please select at least one task to download"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
+msgid "data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
+msgid "selection"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
+msgid "layer"
+msgstr ""
+
+#: ../../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 ""
 
@@ -236,167 +1763,46 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
-msgid "Align Nodes in Line"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
-msgid "Move the selected nodes onto a line."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
-msgid "Please select at least three nodes."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx .gpx.gz)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
-msgid "Align Nodes in Circle"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
-msgid "Save"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:23
-msgid "Save the current data."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:23
-msgid "data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:24
-msgid "selection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
-msgid "layer"
-msgstr ""
-
-#: ../../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
-msgid "New"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:16
-msgid "Create a new map."
-msgstr ""
-
-#: ../../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:42
-msgid "Combine several ways into one."
-msgstr ""
-
-#: ../../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: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 ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
-#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
-msgid "Preferences"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
-msgid "Open a preferences page for global settings."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
-msgid "Save as"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
-msgid "Save the current data to a new file."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
-msgid "Reorder Segments"
-msgstr ""
-
-#: ../../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
-msgid "Please select at least one way."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
-msgid "Reorder segments"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
-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] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
-#, java-format
-msgid "Reorder segments for way {0}"
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+msgid "Add segment"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+msgid "Add a segment between two nodes."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
 msgstr ""
 
@@ -429,4 +1835,12 @@
 #: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:93
 msgid "Can not add a node outside of the world."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
 msgstr ""
 
@@ -503,67 +1917,4 @@
 msgstr ""
 
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr ""
-
 #: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
@@ -574,26 +1925,10 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
-msgid "Add segment"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
-msgid "Add a segment between two nodes."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
-msgid "Download from OSM"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
-msgid "Download map data from the OSM server."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:42
-msgid "Download"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:64
-msgid "Please select at least one task to download"
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
 msgstr ""
 
@@ -614,4 +1949,107 @@
 msgstr ""
 
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload to OSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:61
+msgid "Upload all changes to the OSM server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Objects to add:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+msgid "Objects to modify:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+msgid "Objects to delete:"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
+msgid "Upload these changes?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Nothing to upload. Get some data first."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
+msgid "No changes to upload."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:148
+msgid "Uploading data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
+msgid "Exit the application."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "About"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Display the about screen."
+msgstr ""
+
+#: ../../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:72
+#, java-format
+msgid "last change at {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#, java-format
+msgid "Java Version {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
+msgid "Homepage"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Bug Reports"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "News about JOSM"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
+msgid "Readme"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
+msgid "Revision"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
+msgid "Contribution"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+msgid "About JOSM..."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "File could not be found."
+msgstr ""
+
 #: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
@@ -622,10 +2060,10 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
-msgid "Exit"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:20
-msgid "Exit the application."
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
 msgstr ""
 
@@ -702,10 +2140,97 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:61
+msgid "Rename layer"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:85
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+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 ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:27
+msgid "Reorder Segments"
+msgstr ""
+
+#: ../../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
+msgid "Please select at least one way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:48
+msgid "Reorder segments"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:65
+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] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ReorderAction.java:155
+#, java-format
+msgid "Reorder segments for way {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
 msgstr ""
 
@@ -720,129 +2245,107 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
-#, java-format
-msgid "Downloading {0} way"
-msgid_plural "Downloading {0} ways"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
-msgid "Download incomplete objects"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
-msgid "Download all (selected) incomplete ways from the OSM server."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
-msgid "Please select an incomplete way."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-msgid "Download?"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
-msgid "Load Selection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
-#, java-format
-msgid "Contact {0}..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
-msgid "Downloading..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:56
-#, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
-#, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
-msgid "Search"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:29
-msgid "Search for objects."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:34
-msgid "No data loaded."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:37
-msgid "Please enter a search string."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
-msgid ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-msgid "replace selection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-msgid "add to selection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-msgid "remove from selection"
-msgstr ""
-
-#: ../../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."
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx .gpx.gz)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
+msgid "Open a file."
+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:106
+#, java-format
+msgid "Markers from {0}"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save as"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:23
+msgid "Save the current data to a new file."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:40
+msgid "Preferences"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:28
+msgid "Open a preferences page for global settings."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:30
+msgid "Downloading data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:43
+msgid "No data imported."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Data Layer"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:56
+msgid "OpenStreetMap data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+msgid "Downloading GPS data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:68
+msgid "Raw GPS data"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:111
+msgid "Align Nodes in Line"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:29
+msgid "Move the selected nodes onto a line."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:47
+msgid "Please select at least three nodes."
 msgstr ""
 
@@ -937,1568 +2440,147 @@
 msgstr ""
 
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
-msgid "About"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
-msgid "Display the about screen."
-msgstr ""
-
-#: ../../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:72
-#, java-format
-msgid "last change at {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#, java-format
-msgid "Java Version {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-msgid "Homepage"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-msgid "Bug Reports"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "News about JOSM"
-msgstr ""
-
-#: ../../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:89
-msgid "Readme"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:90
-msgid "Revision"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:91
-msgid "Contribution"
-msgstr ""
-
-#: ../../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:133
-msgid "File could not be found."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
-msgid "Open"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:44
-msgid "Open a file."
-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:106
-#, java-format
-msgid "Markers from {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:29
-msgid "Downloading data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:41
-msgid "No data imported."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:42
-msgid "Data Layer"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:50
-msgid "OpenStreetMap data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:27
-msgid "Downloading GPS data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
-msgid "Raw GPS data"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:23
-msgid "Do not show again"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:28
-msgid "Information"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
-msgid "Report Bug"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-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 ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:88
-msgid "Unexpected Exception"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-
-#: ../../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:16
-msgid "Alt-"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "AltGr-"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:20
-msgid "Shift-"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:53
-msgid "Downloading incomplete ways..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:78
-msgid "Fix data errors"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:112
-#, java-format
-msgid "Segment {0} is deleted but part of Way {1}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:113
-msgid "Data error"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:126
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/IncompleteDownloader.java:164
-#, java-format
-msgid "Data error: Node {0} is deleted but part of Segment {1}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:63
-#, java-format
-msgid "Data error: lat value \"{0}\" is out of bounds."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawGpsReader.java:65
-#, java-format
-msgid "Data error: lon value \"{0}\" is out of bounds."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
-#, java-format
-msgid "Upload {0} {1} ({2})..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
-msgid "Unknown host"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:39
-msgid "Could not detect data format string."
-msgstr ""
-
-#: ../../core/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 ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-#, java-format
-msgid "Unknown data type: \"{0}\"."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:83
-msgid "Maybe add a format string in preferences."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/RawCsvReader.java:88
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
-msgid "Contacting OSM Server..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
-msgid "Downloading OSM data..."
-msgstr ""
-
-#: ../../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:145
-msgid "Found <seg> tag on non-way."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:148
-msgid "Incomplete segment with id=0"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:157
-msgid "NullPointerException, Possibly some missing tags."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:184
-msgid "Illegal object with id=0"
-msgstr ""
-
-#: ../../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:220
-#, java-format
-msgid "Missing required attribute \"{0}\"."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:300
-msgid "Preparing data..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:310
-msgid "Illformed Node id"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:72
-msgid "Incorrect password or username."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:78
-msgid "Username"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
-msgid "Password"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
-msgid "Warning: The password is transferred unencrypted."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:83
-msgid "Save user and password (unencrypted)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:86
-msgid "Enter Password"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:121
-msgid "Aborting..."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:59
-msgid "Sequence"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr ""
-
-#: ../../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"
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:41
+#, java-format
+msgid "Downloading {0} way"
+msgid_plural "Downloading {0} ways"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:76
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
-msgid "Lat/Lon"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:99
-msgid "Object"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
-msgid "Convert to data layer"
-msgstr ""
-
-#: ../../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
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:85
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:157
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgid "point"
-msgid_plural "points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
-msgid "Use global settings."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
-msgid "Import images"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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:339
-#, java-format
-msgid "{0} consists of:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
-#, java-format
-msgid " ({0} deleted.)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
-msgid "GPS unit timezome (difference to photo)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../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
-msgid "Error playing sound"
-msgstr ""
-
-#: ../../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
-msgid "Error displaying URL"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
-msgid "Contacting the OSM server..."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:242
-#, java-format
-msgid "{0} object has conflicts:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "my version:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
-msgid "their version:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
-msgid "resolved version:"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:73
-msgid "Layer"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:75
-#: ../osmarender/src/OsmarenderPlugin.java:98
-#: ../osmarender/src/OsmarenderPlugin.java:104
-msgid "View"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:77
-msgid "Files"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:78
-msgid "Connection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:79
-msgid "Tools"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:81
-msgid "Zoom To"
-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
-msgid "Configure available plugins."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-msgid "Get more plugins"
-msgstr ""
-
-#: ../../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
-msgid "No plugin information found."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
-msgid "Update current"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
-msgid "Configure Plugin Sites"
-msgstr ""
-
-#: ../../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
-#, java-format
-msgid ""
-"Download the following plugins?\n"
-"\n"
-"{0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
-msgid "Download missing plugins"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:34
-msgid "Advanced Preferences"
-msgstr ""
-
-#: ../../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
-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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:118
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:44
-msgid "Look and Feel"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
-msgid ""
-"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
-msgid "CSV import specification (empty: read from first line in data)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:15
-msgid "Draw lines between raw gps points."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
-msgid "Draw large GPS points."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
-msgid "Draw Direction Arrows"
-msgstr ""
-
-#: ../../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
-msgid ""
-"If your gps device draw too few lines, select this to draw lines along your "
-"way."
-msgstr ""
-
-#: ../../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:44
-msgid "Draw larger dots for the GPS points."
-msgstr ""
-
-#: ../../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:53
-msgid "Draw the order numbers of all segments within their way."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
-msgid "Display Settings"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-msgid "Connection Settings"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-msgid "Connection Settings for the OSM server."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-msgid "Map Settings"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-msgid "Settings for the map projection and data interpretation."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:49
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
-msgid "Name"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
-msgid "Choose"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:122
-msgid "Please select a color."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:127
-#, java-format
-msgid "Choose a color for {0}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:132
-msgid "Colors used by different objects in JOSM."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
-msgid "Colors"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:34
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
-msgid "Login name (email) to the OSM account."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
-msgid "Base Server URL"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
-msgid "OSM username (email)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "OSM password"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:42
-msgid "Could not read bookmarks."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:56
-msgid "Could not write bookmark."
-msgstr ""
-
-#: ../../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:147
-msgid "layer not in list."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:62
-msgid "Getting Started"
-msgstr ""
-
-#: ../../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: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
-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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
-msgid "Upload Preferences"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:30
-msgid "Upload the current preferences to the server"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:46
-msgid "Name of the user."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:47
-msgid "OSM Password."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:48
-msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
-msgid "any"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
-msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
-
-#: ../../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:85
-msgid "Reload"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
-msgid "Revert"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:89
-msgid "History"
-msgstr ""
-
-#: ../../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:99
-msgid "Date"
-msgstr ""
-
-#: ../../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:142
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
-msgid "Delete the selected layer."
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../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:104
-msgid "Show/Hide Text"
-msgstr ""
-
-#: ../../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:145
-msgid "Layers"
-msgstr ""
-
-#: ../../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:221
-msgid "Move the selected layer one row up."
-msgstr ""
-
-#: ../../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:241
-msgid "Merge the selected layer into the layer directly below."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
-msgid "Conflict"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
-msgid "Merging conflicts."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
-msgid "Resolve"
-msgstr ""
-
-#: ../../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:74
-msgid "Select"
-msgstr ""
-
-#: ../../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:109
-msgid "Please select something from the conflict list."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
-msgid "Resolve Conflicts"
-msgstr ""
-
-#: ../../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
-msgid "# Objects"
-msgstr ""
-
-#: ../../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: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] ""
-msgstr[1] ""
-
-#: ../../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 ""
-
-#: ../../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:160
-#, java-format
-msgid "Change properties of {0} object"
-msgid_plural "Change properties of {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../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:183
-msgid "Please select a key"
-msgstr ""
-
-#: ../../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:278
-msgid "Properties"
-msgstr ""
-
-#: ../../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:345
-msgid "Add a new key/value pair to all objects"
-msgstr ""
-
-#: ../../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:347
-msgid "Delete the selected key in all objects"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Command Stack"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
-msgid "Current Selection"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:49
-msgid "Open a selection list window."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:86
-msgid "Error while parsing"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
-msgid "File not found"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
-msgid "min lon"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
-msgid "max lat"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
-msgid "max lon"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
-msgid "URL from www.openstreetmap.org"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:67
-msgid "Please enter a name for the location."
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-msgid "Remove"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
-msgid "Select a bookmark first."
-msgstr ""
-
-#: ../../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
-msgid "Download Area"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
-msgid "Java OpenStreetMap Editor"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
-msgid "usage"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
-msgid "options"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
-msgid "Show this help"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
-msgid "Standard unix geometry argument"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
-msgid "Download the bounding box"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
-msgid "Open file (as raw gps, if .gpx or .csv)"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
-msgid "Download the bounding box as raw gps"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
-msgid "Select with the given search"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
-msgid "Don't launch in fullscreen mode"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
-msgid "Reset the preferences to default"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:131
-msgid "Set the language. Example: "
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-msgid "examples"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
-
-#: ../../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
-#, java-format
-msgid "Could not download plugin: {0} from {1}"
-msgstr ""
-
-#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr ""
-
-#: ../grid/src/grid/GridLayer.java:192
-msgid "Grid origin location"
-msgstr ""
-
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
+msgid "Download incomplete objects"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
+msgid "Please select an incomplete way."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+msgid "Download?"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+msgid "Please select a scheme to use."
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
+msgid "Please select the scheme to delete."
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
+msgid "Use the selected scheme from the list."
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+msgid "Use the current colors as a new color scheme."
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+msgid "Delete the selected scheme from the list."
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+msgid "Color Schemes"
+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
+msgid "Connecting"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:169
+msgid "Connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:181
+#: ../livegps/livegps/LiveGpsAcquirer.java:196
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:190
+msgid "Connection Failed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+msgid "Show GPS data."
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+msgid "Way Info"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:51
 #: ../grid/src/grid/GridLayer.java:193
+msgid "Latitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#: ../grid/src/grid/GridLayer.java:195
+msgid "Longitude"
+msgstr ""
+
 #: ../livegps/livegps/LiveGpsDialog.java:55
-msgid "Latitude"
-msgstr ""
-
-#: ../grid/src/grid/GridLayer.java:195
+msgid "Speed"
+msgstr ""
+
 #: ../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
-msgid "Grid layout"
-msgstr ""
-
-#: ../grid/src/grid/GridLayer.java:222
-msgid "Grid layer:"
-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"
+msgid "Course"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
 msgstr ""
 
@@ -2515,332 +2597,83 @@
 msgstr ""
 
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
+msgid "Update"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+msgid "Add Site"
+msgstr ""
+
+#: ../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
+msgid "Delete Site(s)"
+msgstr ""
+
+#: ../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:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../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:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../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: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 ""
+
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 msgid "Version"
 msgstr ""
 
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
-msgid "Update"
-msgstr ""
-
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
-msgid "Install"
-msgstr ""
-
-#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
-msgid "Add Site"
-msgstr ""
-
-#: ../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
-msgid "Delete Site(s)"
-msgstr ""
-
-#: ../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:124
-msgid "Check Site(s)"
-msgstr ""
-
-#: ../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:152
-msgid "Add a new plugin site."
-msgstr ""
-
-#: ../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: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
-#, java-format
-msgid ""
-"Error initializing test {0}:\n"
-" {1}"
-msgstr ""
-
-#: ../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
-msgid "Open the validation window."
-msgstr ""
-
-#: ../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
-#, java-format
-msgid "Version: {0}<br>Last change at {1}"
-msgstr ""
-
-#: ../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
-msgid "Single node segments."
-msgstr ""
-
-#: ../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
-msgid "Single node segments"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
-msgid "Untagged nodes."
-msgstr ""
-
-#: ../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
-msgid "Reused segments."
-msgstr ""
-
-#: ../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
-msgid "Reused segments"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
-msgid "Tagged segments"
-msgstr ""
-
-#: ../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
-#, java-format
-msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
-
-#: ../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
-msgid "Duplicated segments"
-msgstr ""
-
-#: ../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
-msgid "Properties checker."
-msgstr ""
-
-#: ../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
-#, java-format
-msgid ""
-"Could not download spellcheck data file:\n"
-" {0}"
-msgstr ""
-
-#: ../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
-msgid "Check property keys."
-msgstr ""
-
-#: ../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
-msgid ""
-"The sources (url or filename) of spell check data files. See http://wiki."
-"openstreetmap.org/index.php/User:JLS/speller for help."
-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 "Edit the selected source."
-msgstr ""
-
-#: ../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 "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
-msgid "Orphaned segments."
-msgstr ""
-
-#: ../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
-msgid "Segments not in a way"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:37
-msgid "Untagged ways."
-msgstr ""
-
-#: ../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
-msgid "Unnamed ways"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
-msgid "Untagged ways"
-msgstr ""
-
-#: ../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
-msgid "Nodes have conflicting key: "
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
-msgid "Merge Nodes"
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../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
+msgid "Downloading "
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
@@ -2849,27 +2682,20 @@
 msgstr ""
 
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr ""
-
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:75
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
-msgid "WMS Plugin Preferences"
-msgstr ""
-
-#: ../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
-msgid "Downloading "
+#: ../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 ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
 msgstr ""
 
@@ -2901,4 +2727,10 @@
 msgstr ""
 
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr ""
+
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
@@ -2937,7 +2769,274 @@
 msgstr ""
 
-#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
-msgid ""
-"Could not start browser. Please check that the executable path is correct."
+#: ../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/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
+msgid "Duplicated segments"
+msgstr ""
+
+#: ../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
+msgid "Nodes have conflicting key: "
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:173
+msgid "Merge Nodes"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:111
+msgid "Properties checker."
+msgstr ""
+
+#: ../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
+#, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr ""
+
+#: ../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
+msgid "Check property keys."
+msgstr ""
+
+#: ../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
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+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 "Edit the selected source."
+msgstr ""
+
+#: ../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 "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/UntaggedWay.java:37
+msgid "Untagged ways."
+msgstr ""
+
+#: ../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
+msgid "Unnamed ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:73
+msgid "Untagged ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:35
+msgid "Single node segments."
+msgstr ""
+
+#: ../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
+msgid "Single node segments"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ReusedSegment.java:26
+msgid "Reused segments."
+msgstr ""
+
+#: ../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
+msgid "Reused segments"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/TaggedSegment.java:29
+msgid "Tagged segments"
+msgstr ""
+
+#: ../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/OrphanSegment.java:28
+msgid "Orphaned segments."
+msgstr ""
+
+#: ../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
+msgid "Segments not in a way"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+msgid "Untagged nodes."
+msgstr ""
+
+#: ../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/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/ValidatorDialog.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:59
+msgid "Open the validation window."
+msgstr ""
+
+#: ../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:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
+#, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr ""
+
+#: ../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 ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+msgid "Tways"
 msgstr ""
 
@@ -2961,9 +3060,61 @@
 msgstr ""
 
-#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
-msgid "Tways"
-msgstr ""
-
-#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#: ../namefinder/namefinder/PlaceSelection.java:39
+msgid "Search..."
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:101
+msgid "NullPointerException. Possible some missing tags."
+msgstr ""
+
+#: ../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 ""
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+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
+msgid "Grid layout"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:222
+msgid "Grid layer:"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:56
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
@@ -2978,117 +3129,4 @@
 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
-msgid "Connecting"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsAcquirer.java:169
-msgid "Connected"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsAcquirer.java:181
-#: ../livegps/livegps/LiveGpsAcquirer.java:196
-msgid "Not connected"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsAcquirer.java:190
-msgid "Connection Failed"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:48
-msgid "Live GPS"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:48
-msgid "Show GPS data."
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:51
-msgid "Status"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:53
-msgid "Way Info"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:59
-msgid "Speed"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsDialog.java:61
-msgid "Course"
-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..."
-msgstr ""
-
-#: ../namefinder/namefinder/PlaceSelection.java:101
-msgid "NullPointerException. Possible some missing tags."
-msgstr ""
-
-#: ../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 ""
-
-#: ../waypoints/src/WaypointReader.java:59
-#, java-format
-msgid "Data error: lon value \"{0}\" is out of bound."
-msgstr ""
-
 #: ../waypoints/src/WaypointOpenAction.java:33
 msgid "Open waypoints file"
@@ -3099,33 +3137,11 @@
 msgstr ""
 
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:63
-msgid "Use"
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
-msgid "Please select a scheme to use."
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-msgid "Color Scheme"
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
-msgid "Please select the scheme to delete."
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:106
-msgid "Use the selected scheme from the list."
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
-msgid "Use the current colors as a new color scheme."
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
-msgid "Delete the selected scheme from the list."
-msgstr ""
-
-#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
-msgid "Color Schemes"
-msgstr ""
+#: ../waypoints/src/WaypointReader.java:55
+#, java-format
+msgid "Data error: lat value \"{0}\" is out of bound."
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:59
+#, java-format
+msgid "Data error: lon value \"{0}\" is out of bound."
+msgstr ""
Index: /applications/editors/josm/plugins/lang/ro/ro.po
===================================================================
--- /applications/editors/josm/plugins/lang/ro/ro.po	(revision 3995)
+++ /applications/editors/josm/plugins/lang/ro/ro.po	(revision 3996)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 14:05+0200\n"
+"POT-Creation-Date: 2007-08-07 23:37+0200\n"
 "PO-Revision-Date: 2006-10-14 10:09+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -21,48 +21,446 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../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/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/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/MainApplet.java:78
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+msgid "Username"
+msgstr "Nume utilizator"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:81
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:76
+msgid "Password"
+msgstr "Parolă"
+
+#: ../../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/dialogs/PropertiesDialog.java:346
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+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:76
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:54
+msgid "Help"
+msgstr "Ajutor"
+
+#: ../../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/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/PleaseWaitDialog.java:23
+msgid "Contacting the OSM server..."
+msgstr "Contactez serverul OSM..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "Cancel"
+msgstr "Renunţă"
+
+#: ../../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:142
+#, 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/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/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/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/MarkerLayer.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+msgid "Customize Color"
+msgstr "Personalizează culoarea"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr "OK"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Implicit"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Alegeţi o culoare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+msgid "Convert to data layer"
+msgstr "Converteşte la strat de date"
+
+#: ../../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:159
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "urmă"
+msgstr[1] "urme"
+msgstr[2] "de urme"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punct"
+msgstr[1] "puncte"
+msgstr[2] "de puncte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "o urmă cu {0} punct"
+msgstr[1] "o urmă cu {0} puncte"
+msgstr[2] "o urmă cu {0} de puncte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+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/RawGpsLayer.java:189
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punct"
+msgstr[1] "{0} puncte"
+msgstr[2] "{0} de puncte"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+msgid "Customize line drawing"
+msgstr "Personalizează trasarea liniilor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Use global settings."
+msgstr "Utilizează opţiunile globale."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+msgid "Draw lines between points for this layer."
+msgstr "Trasează linii între puncte pentru acest strat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Do not draw lines between points for this layer."
+msgstr "Nu trasa linii între puncte pentru acest strat."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+msgid "Select line drawing options"
+msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Import images"
+msgstr "Importă imagini"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+msgid "JPEG images (*.jpg)"
+msgstr "Imagine JPEG (*.jpg)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr "Citire GPS..."
+
+#: ../../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}"
+
+#: ../../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}"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr "Citesc {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr "Imagini geoetichetate"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Sfârşit GPS: {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr "diferentă curentă: {0}s"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr "diferenţă zonă de timp: "
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagine"
+msgstr[1] "imagini"
+msgstr[2] "de imagini"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} în urmă."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr "Sincronizare ceas"
+
+#: ../../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."
+
+#: ../../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}\"."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr "Imagine"
+
+#: ../../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)"
+
+#: ../../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)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr "Sincronizare timp cu unitatea GPS"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../../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"
@@ -71,7 +469,7 @@
 msgstr[2] "de noduri"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:185
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
 #: ../../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"
@@ -80,7 +478,7 @@
 msgstr[2] "de segmente"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:186
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../../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"
@@ -89,38 +487,860 @@
 msgstr[2] "de căi"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:187
+#: ../../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/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/download/BookmarkSelection.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:345
+#: ../../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/command/AddCommand.java:52
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:75
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:387
+msgid "Add"
+msgstr "Adaugă"
+
+#: ../../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/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/DownloadDialog.java:75
+msgid "Data Sources and Types"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:107
+#, fuzzy
+msgid "Download as new layer"
+msgstr "Descarc {0} {1}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:110
+#, fuzzy
+msgid "Download Area"
+msgstr "Descarc?"
+
+#: ../../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:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} obiect are conflicte:"
+msgstr[1] "{0} obiecte au conflicte:"
+msgstr[2] "{0} de obiecte au conflicte:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
+msgid "my version:"
+msgstr "versiunea mea:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
+msgid "their version:"
+msgstr "versiunea lor:"
+
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
+msgid "resolved version:"
+msgstr "rezolvat în versiunea:"
+
+#: ../../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/gui/dialogs/LayerListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../../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/command/DeleteCommand.java:46
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:89
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:411
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SingleNodeSegment.java:85
+msgid "Delete"
+msgstr "Şterge"
+
+#: ../../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/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:334
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../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/dialogs/PropertiesDialog.java:339
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:415
+msgid "Please select the row to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../../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/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/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/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/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
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:247
+msgid "Object"
+msgstr "Obiect"
+
+#: ../../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:139
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+msgid "Not implemented yet."
+msgstr "Nu a fost încă implementat."
+
+#: ../../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/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/LayerListPopup.java:25
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
+msgid "Info"
+msgstr "Informaţii"
+
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:245
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: ../../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/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:118
+#, fuzzy, java-format
+msgid "New value for {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../../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/LafPreference.java:44
+msgid "Look and Feel"
+msgstr "Aspect"
+
+#: ../../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 ""
+"Dacă dispozitivul gps a desenat prea puţine linii, selectaţi această opţiune "
+"pentru a desena linii pe cale."
+
+#: ../../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/ToolbarPreferences.java:106
+msgid "Separator"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>Specificaţii pentru formatul şirului de import. lat/lon şi timp sunt "
+"importate.<br><b>lat</b>: Coordonata latitudine<br><b>lon</b>: Coordonata "
+"longitudine<br><b>time</b>: Timpul măsurat, ca şir<br><b>ignore</b>: Sări "
+"peste acest câmp<br>Un exemplu: \"ignore ignore lat lon\" va folosi ' ' ca "
+"delimitare, va sări peste primele două valori şi apoi va citi lat/lon."
+"<br>Alt examplu: \"lat,lon\" va citi doar valorile lat/lon separate prin "
+"virgulă.</html>"
+
+#: ../../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/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"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
+msgid "OSM username (email)"
+msgstr "Nume utilizator OSM (email)"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
+msgid "OSM password"
+msgstr "Parola OSM"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ATENŢIE: Parola este păstrată în format text clar în fişierul de "
+"preferinţe.<br>Parola este transferată în text clar către server, codată în "
+"adresă.<br><b>Nu folosiţi o parolă importantă.</b></html>"
+
+#: ../../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/ColorPreference.java:49
+msgid "Color"
+msgstr "Culoare"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
+msgid "Name"
+msgstr "Nume"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:120
+msgid "Choose"
+msgstr "Alegeţi"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:124
+msgid "Please select a color."
+msgstr "Vă rog selectaţi o culoare."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:129
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Alegeţi o culoare pentru {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
+msgid "Colors used by different objects in JOSM."
+msgstr "Culori utilizate de diferite obiecte în JOSM."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
+msgid "Colors"
+msgstr "Culori"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+msgid "background"
+msgstr "fundal"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
 msgid "incomplete way"
 msgstr "cale incompletă"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:188
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "selected"
 msgstr "selectat"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:189
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "gps point"
 msgstr "punct gps"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:190
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr "conflict"
 
-#: ../../core/src/org/openstreetmap/josm/data/Preferences.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "scale"
 msgstr "scală"
 
-#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+msgid "inactive"
+msgstr ""
+
+#: ../../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
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:92
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
+msgid "Plugins"
+msgstr "Module"
+
+#: ../../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: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 "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 ""
+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/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/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "diferit"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "de la"
+
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "poziţie"
+
+#: ../../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/ToConflict.java:19
+msgid "to"
+msgstr "la"
 
 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:50
@@ -145,4 +1365,34 @@
 msgstr "incomplet"
 
+#: ../../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/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}"
+
 #: ../../core/src/org/openstreetmap/josm/Main.java:227
 #, java-format
@@ -184,110 +1434,318 @@
 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/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Schimbă"
+
+#: ../../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/MoveCommand.java:122
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+msgid "Move"
+msgstr "Mută"
+
+#: ../../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/SequenceCommand.java:59
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#: ../../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/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/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/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/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/OsmConnection.java:72
+msgid "Incorrect password or username."
+msgstr "Parolă sau nume utilizator incorecte."
+
+#: ../../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/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/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Eroare la prelucrare."
+
+#: ../../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/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/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/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/SaveAction.java:23
@@ -299,4 +1757,108 @@
 msgstr "Salvează datele curente."
 
+#: ../../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/search/SelectionWebsiteLoader.java:32
+msgid "Load Selection"
+msgstr "Încarcă selecţia"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contactez {0}..."
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
+msgid "Downloading..."
+msgstr "Descarc..."
+
+#: ../../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}\""
+
+#: ../../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}\""
+
+#: ../../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"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Căutare în întreg textul.<ul><li><code>Bulevardul Unirii</code>  - "
+"'Bulevardul' şi 'Unirii' în orice cheie sau nume.</li><li><code>\"Bulevardul "
+"Unirii\"</code>  - 'Bulevardul Unirii' în orice cheie sau nume.</"
+"li><li><code>name:Uni</code>  - 'Uni' oriunde în nume.</li><li><code>-name:"
+"Uni</code>  - nu există 'Uni' în nume.</li><li><code>foot:</code>  - cheia "
+"foot are orice valoare.</ul></html>"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
+msgid "replace selection"
+msgstr "Înlocuieşte selecţia"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+msgid "add to selection"
+msgstr "adaugă la selecţie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+msgid "remove from selection"
+msgstr "elimină din selecţie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+msgid "case sensitive"
+msgstr ""
+
+#: ../../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:65
+#, 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/AutoScaleAction.java:23
 msgid "data"
@@ -321,108 +1883,57 @@
 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/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/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/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/AddNodeAction.java:48
@@ -456,4 +1967,12 @@
 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/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/SelectionAction.java:73
@@ -540,67 +2059,4 @@
 msgstr "Crează o nouă cale"
 
-#: ../../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"
@@ -612,29 +2068,11 @@
 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/UndoAction.java:23
+msgid "Undo"
+msgstr "Anulează"
+
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Anulează ultima acţiune."
 
 #: ../../core/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:28
@@ -656,4 +2094,108 @@
 msgstr "Inversează segmentele"
 
+#: ../../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/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/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: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: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/DiskAccessAction.java:41
 msgid "File exists. Overwrite?"
@@ -664,11 +2206,11 @@
 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/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/GpxExportAction.java:40
@@ -747,123 +2289,17 @@
 msgstr "Alegeţi o licenţă predefinită"
 
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo"
-msgstr "Anulează"
-
-#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Anulează ultima acţiune."
-
-#: ../../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"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
-msgid "Please select an incomplete way."
-msgstr "Vă rog selectaţi o cale incompletă."
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr "Descarc {0} căi incomplete?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
-msgid "Download?"
-msgstr "Descarc?"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:32
-msgid "Load Selection"
-msgstr "Încarcă selecţia"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:39
-#, java-format
-msgid "Contact {0}..."
-msgstr "Contactez {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:44
-msgid "Downloading..."
-msgstr "Descarc..."
-
-#: ../../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}\""
-
-#: ../../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}\""
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
-msgid ""
-"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
-"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
-"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
-"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
-"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
-msgstr ""
-"<html>Căutare în întreg textul.<ul><li><code>Bulevardul Unirii</code>  - "
-"'Bulevardul' şi 'Unirii' în orice cheie sau nume.</li><li><code>\"Bulevardul "
-"Unirii\"</code>  - 'Bulevardul Unirii' în orice cheie sau nume.</"
-"li><li><code>name:Uni</code>  - 'Uni' oriunde în nume.</li><li><code>-name:"
-"Uni</code>  - nu există 'Uni' în nume.</li><li><code>foot:</code>  - cheia "
-"foot are orice valoare.</ul></html>"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-msgid "replace selection"
-msgstr "Înlocuieşte selecţia"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-msgid "add to selection"
-msgstr "adaugă la selecţie"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-msgid "remove from selection"
-msgstr "elimină din selecţie"
-
-#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-msgid "case sensitive"
-msgstr ""
+#: ../../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/SaveActionBase.java:59
@@ -903,4 +2339,176 @@
 msgid "An error occurred while saving."
 msgstr "A intervenit o eroare în timpul salvării."
+
+#: ../../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/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/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/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/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/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/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/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/downloadtasks/DownloadOsmTask.java:30
+msgid "Downloading data"
+msgstr "Descarc date"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:43
+msgid "No data imported."
+msgstr "Nu au fost importate date."
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Data Layer"
+msgstr "Strat de date"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:56
+msgid "OpenStreetMap data"
+msgstr "Date OpenStreetMap"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+msgid "Downloading GPS data"
+msgstr "Descarc date GPS"
+
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:68
+msgid "Raw GPS data"
+msgstr "Date GPS neprelucrate"
+
+#: ../../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/SplitWayAction.java:101
@@ -1006,1675 +2614,160 @@
 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"
+#: ../../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"
+
+#: ../../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."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:71
+msgid "Please select an incomplete way."
+msgstr "Vă rog selectaţi o cale incompletă."
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Descarc {0} căi incomplete?"
+
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:74
+msgid "Download?"
+msgstr "Descarc?"
+
+#: ../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"
+
+#: ../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:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Date GPS neprelucrate"
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+#, fuzzy
+msgid "Way 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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
-msgid "Convert to data layer"
-msgstr "Converteşte la strat de date"
-
-#: ../../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"
-msgstr[0] "urmă"
-msgstr[1] "urme"
-msgstr[2] "de urme"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punct"
-msgstr[1] "puncte"
-msgstr[2] "de puncte"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:183
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "o urmă cu {0} punct"
-msgstr[1] "o urmă cu {0} puncte"
-msgstr[2] "o urmă cu {0} de puncte"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:187
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-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/RawGpsLayer.java:187
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punct"
-msgstr[1] "{0} puncte"
-msgstr[2] "{0} de puncte"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Customize line drawing"
-msgstr "Personalizează trasarea liniilor"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
-msgid "Use global settings."
-msgstr "Utilizează opţiunile globale."
-
-#: ../../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."
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:209
-msgid "Select line drawing options"
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../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ţă"
-
-#: ../../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"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
-msgid "Import images"
-msgstr "Importă imagini"
-
-#: ../../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)"
-
-#: ../../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}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr "Citire GPS..."
-
-#: ../../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}"
-
-#: ../../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}"
-
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr "Citesc {0}..."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr "Imagini geoetichetate"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Start GPS: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Sfârşit GPS: {0}"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr "diferentă curentă: {0}s"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr "diferenţă zonă de timp: "
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagine"
-msgstr[1] "imagini"
-msgstr[2] "de imagini"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} în urmă."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr "Sincronizare ceas"
-
-#: ../../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."
-
-#: ../../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}\"."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr "Imagine"
-
-#: ../../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)"
-
-#: ../../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)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr "Sincronizare timp cu unitatea GPS"
-
-#: ../../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."
-
-#: ../../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..."
-
-#: ../../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:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} obiect are conflicte:"
-msgstr[1] "{0} obiecte au conflicte:"
-msgstr[2] "{0} de obiecte au conflicte:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "my version:"
-msgstr "versiunea mea:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:251
-msgid "their version:"
-msgstr "versiunea lor:"
-
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:257
-msgid "resolved version:"
-msgstr "rezolvat în versiunea:"
-
-#: ../../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</"
-"b>: The latitude coordinate<br><b>lon</b>: The longitude "
-"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
-"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
-"delimiter, skip the first two values and read then lat/lon.<br>Other "
-"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
-msgstr ""
-"<html>Specificaţii pentru formatul şirului de import. lat/lon şi timp sunt "
-"importate.<br><b>lat</b>: Coordonata latitudine<br><b>lon</b>: Coordonata "
-"longitudine<br><b>time</b>: Timpul măsurat, ca şir<br><b>ignore</b>: Sări "
-"peste acest câmp<br>Un exemplu: \"ignore ignore lat lon\" va folosi ' ' ca "
-"delimitare, va sări peste primele două valori şi apoi va citi lat/lon."
-"<br>Alt examplu: \"lat,lon\" va citi doar valorile lat/lon separate prin "
-"virgulă.</html>"
-
-#: ../../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 ""
-"Dacă dispozitivul gps a desenat prea puţine linii, selectaţi această opţiune "
-"pentru a desena linii pe cale."
-
-#: ../../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"
+#: ../livegps/livegps/LiveGpsDialog.java:51
+#: ../grid/src/grid/GridLayer.java:193
+msgid "Latitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:53
+#: ../grid/src/grid/GridLayer.java:195
+msgid "Longitude"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:57
+#, fuzzy
+msgid "Course"
 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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:134
-msgid "Colors"
-msgstr "Culori"
-
-#: ../../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"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:40
-msgid "OSM username (email)"
-msgstr "Nume utilizator OSM (email)"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "OSM password"
-msgstr "Parola OSM"
-
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:44
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>ATENŢIE: Parola este păstrată în format text clar în fişierul de "
-"preferinţe.<br>Parola este transferată în text clar către server, codată în "
-"adresă.<br><b>Nu folosiţi o parolă importantă.</b></html>"
-
-#: ../../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"
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr ""
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
 msgstr ""
 
@@ -2692,4 +2785,62 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 #, fuzzy
@@ -2697,358 +2848,32 @@
 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/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"
+
+#: ../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/WMSPlugin.java:97
@@ -3056,32 +2881,26 @@
 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"
+#: ../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."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
+msgstr ""
 
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
@@ -3112,4 +2931,10 @@
 msgstr ""
 
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "ultima modificare la {0}"
+
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
 msgid "Yahoo! WMS server"
@@ -3152,8 +2977,299 @@
 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 ""
+#: ../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/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/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"
+
+#: ../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/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/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/ChangePropertyKeyCommand.java:66
+#, fuzzy, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Elimină \"{0}\" pentru"
+
+#: ../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/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/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/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/ValidatorDialog.java:59
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:80
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+msgid "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:63
+msgid "Data validator"
+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 ""
+
+#: ../tways/src/org/openstreetmap/josm/plugins/tways/TwaysPlugin.java:20
+#, fuzzy
+msgid "Tways"
+msgstr "cale"
 
 #: ../tways/src/org/openstreetmap/josm/plugins/tways/CreateLinearWaysAction.java:47
@@ -3179,10 +3295,64 @@
 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
+#: ../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."
+
+#: ../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 ""
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+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"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:56
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:57
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
@@ -3197,118 +3367,13 @@
 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."
-
-#: ../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/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Deschide un fişier."
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Deschide un fişier."
 
 #: ../waypoints/src/WaypointReader.java:55
@@ -3321,52 +3386,4 @@
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Eroare date: valoarea lon \"{0}\" este în afara limitelor."
-
-#: ../waypoints/src/WaypointOpenAction.java:33
-#, fuzzy
-msgid "Open waypoints file"
-msgstr "Deschide un fişier."
-
-#: ../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"
Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 3995)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 3996)
@@ -1,8 +1,13 @@
 <project name="tagging-preset-tester" default="build" basedir=".">
 
-	<target name="build">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar" />
+	</target>
+
+	<target name="build" depends="compile">
 		<mkdir dir="dist"/>
 		<jar destfile="dist/tagging-preset-tester.jar" 
-			 basedir="bin"
+			 basedir="build"
 			 manifest="src/org/openstreetmap/josm/plugins/taggingpresettester/MANIFEST.MF">
 			<fileset dir="."><include name="images/*"/></fileset>
@@ -12,4 +17,5 @@
 	<target name="clean">
 		<delete dir="dist"/>
+		<delete dir="build"/>
 	</target>
 
