Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 12493)
+++ applications/editors/josm/i18n/po/cs.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-12-15 00:39+0000\n"
 "Last-Translator: Martin Petricek <singularita@gmail.com>\n"
@@ -1189,5 +1189,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Informace"
@@ -3989,5 +3989,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Konec"
@@ -6463,10 +6463,10 @@
 msgstr ""
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "Tunel"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6479,69 +6479,69 @@
 msgstr "Most"
 
-#: surveyor.java:16
+#: surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Parkoviště"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "Jednosměrka"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Hasičská stanice"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Hotel"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Restaurace"
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Střelba"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Změnit"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Dálnice"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Silnice 1. třídy"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Silnice 2. třídy"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Místní silnice"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 12493)
+++ applications/editors/josm/i18n/po/de.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-12-22 23:28+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
@@ -62,5 +62,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
 #, java-format
-msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
 "Eine unvorhergesehene Ausnahme trat auf, welche vom Plugin \"{0}\" kommen "
@@ -73,5 +74,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Try updating to the newest version of this plugin before reporting a bug."
+msgid ""
+"Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 "Versuchen Sie zuerst eine Aktualisierung auf die neueste Version des "
@@ -368,5 +370,6 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:461
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:463
@@ -509,5 +512,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
-msgid "partial: different selected objects have different values, do not change"
+msgid ""
+"partial: different selected objects have different values, do not change"
 msgstr ""
 "teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht "
@@ -581,5 +585,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+msgstr ""
+"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:53
@@ -748,5 +753,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:133
 msgid "Please select the objects you want to change properties for."
-msgstr "Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
@@ -795,5 +801,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
-msgstr "Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
@@ -966,5 +973,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
 msgid "Remove the member in the current table row from this relation"
-msgstr "Entferne das Mitglied in der aktuellen Tabellenzeile von dieser Relation."
+msgstr ""
+"Entferne das Mitglied in der aktuellen Tabellenzeile von dieser Relation."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
@@ -980,5 +988,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
 msgid "Highlight the member from the current table row as JOSM's selection"
-msgstr "Übernehme das Mitglied der aktuellen Tabellenzeile als Auswahl in JOSM."
+msgstr ""
+"Übernehme das Mitglied der aktuellen Tabellenzeile als Auswahl in JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
@@ -1147,5 +1156,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
-msgid "Set the selected elements on the map to the selected items in the list above."
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 "Setze die gewählten Elemente auf der Karte auf die obige Liste der "
@@ -1211,5 +1221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1239,5 +1249,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68
 msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Öffnet ein Dialog-Fenster mit den gewählten Objekten aus der obigen Liste."
+msgstr ""
+"Öffnet ein Dialog-Fenster mit den gewählten Objekten aus der obigen Liste."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105
@@ -1301,5 +1312,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "You need to pause audio at the moment when you hear your synchronization cue."
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 "Sie müssen die Tonwiedergabe auf Pause stellen, sobald Sie Ihren "
@@ -1988,5 +2000,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-msgid "Login password to the OSM account. Leave blank to not store any password."
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM Server. Leer lassen, wenn kein Passwort gespeichert "
@@ -2264,5 +2277,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
+msgstr ""
+"GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55
@@ -2282,5 +2296,6 @@
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr "Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
+msgstr ""
+"Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
@@ -2324,5 +2339,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:143
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Der Faktor um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
+msgstr ""
+"Der Faktor um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144
@@ -2360,5 +2376,6 @@
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr "Diverse Optionen, die die visuelle Repräsentation des Programms beeinflussen."
+msgstr ""
+"Diverse Optionen, die die visuelle Repräsentation des Programms beeinflussen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
@@ -2455,6 +2472,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-msgid "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-msgstr "Maximallänge zum Linienzeichnen (in Meter). Für alle Linien auf -1 setzen."
+msgid ""
+"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+msgstr ""
+"Maximallänge zum Linienzeichnen (in Meter). Für alle Linien auf -1 setzen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
@@ -2463,5 +2482,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Force drawing of lines if the imported data contain no line information."
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -2581,5 +2601,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:60
 msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Standardwert momentan unbekannt (Einstellung wurde noch nicht benutzt)."
+msgstr ""
+"Standardwert momentan unbekannt (Einstellung wurde noch nicht benutzt)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
@@ -2676,5 +2697,6 @@
 "<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
 "</p>"
-msgstr "<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
+msgstr ""
+"<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:186
@@ -2910,5 +2932,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:143
 #, java-format
-msgid "The plugin {0} seem to be broken or could not be downloaded automatically."
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
 msgstr ""
 "Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch "
@@ -4001,5 +4024,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+msgstr ""
+"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
@@ -4052,5 +4076,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:617
 msgid "Click to create a new way to the existing node."
-msgstr "Klicken, um einen neuen Weg zum existierenden Knotenpunkt zu erstellen."
+msgstr ""
+"Klicken, um einen neuen Weg zum existierenden Knotenpunkt zu erstellen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:619
@@ -4060,5 +4085,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:622
 msgid "Click to insert a node and create a new way."
-msgstr "Klicken, um einen Knotenpunkt einzufügen und einen neuen Weg zu erstellen."
+msgstr ""
+"Klicken, um einen Knotenpunkt einzufügen und einen neuen Weg zu erstellen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:624
@@ -4086,5 +4112,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:391
-msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 "Um die Bewegung zu stoppen, Maustaste loslassen. Strg: mit dem nächsten "
@@ -4118,5 +4145,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Beenden"
@@ -4185,9 +4212,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
 msgid "Please select closed way(s) of at least four nodes."
-msgstr "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkte auswählen."
+msgstr ""
+"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkte auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
+msgstr ""
+"Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
@@ -4246,5 +4275,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
 msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Bitte genau drei Knoten oder einen Weg mit drei Knotenpunkten auswählen."
+msgstr ""
+"Bitte genau drei Knoten oder einen Weg mit drei Knotenpunkten auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
@@ -4400,5 +4430,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
-msgid "* One way that has one or more nodes that are used by more than one way, or"
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 "* Einen Weg der einen oder mehr Knoten hat, die von mehr als einem Weg "
@@ -4406,5 +4437,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
-msgid "* One way and one or more of its nodes that are used by more than one way."
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 "* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg genutzt "
@@ -4736,5 +4768,6 @@
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
-msgid "Open the tagging preset test tool for previewing tagging preset dialogs."
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 "Öffne das Testtool für Tagging-Vorlagen, um eine Vorschau auf die Vorlagen "
@@ -4743,5 +4776,6 @@
 #: ../plugins/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 "Sie müssen zuerst in den Einstellungen eine Quelle für Presets hinzufügen."
+msgstr ""
+"Sie müssen zuerst in den Einstellungen eine Quelle für Presets hinzufügen."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:43
@@ -4816,5 +4850,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "Ein Plugin, welche es anderen Programmen erlaubt JOSM zu kontrollieren."
+msgstr ""
+"Ein Plugin, welche es anderen Programmen erlaubt JOSM zu kontrollieren."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
@@ -5019,5 +5054,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
+msgstr ""
+"Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
@@ -5047,5 +5083,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
-msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 "Auflösung der Landsat-Kacheln, gemessen in Pixel pro Grad. Standard ist "
@@ -5080,9 +5117,11 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "Maximale Größe des des Speicherverzeichnisses in bytes. Standard ist 300MB"
+msgstr ""
+"Maximale Größe des des Speicherverzeichnisses in bytes. Standard ist 300MB"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
+msgstr ""
+"Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -5235,5 +5274,6 @@
 "A OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
+msgstr ""
+"Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:94
@@ -5282,5 +5322,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
-msgid "This test checks for ways that contain some of their nodes more than once."
+msgid ""
+"This test checks for ways that contain some of their nodes more than once."
 msgstr "Dieser Test sucht nach Wegen, die einine Knoten mehrfach enthalten."
 
@@ -5481,5 +5522,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
-msgid "This test checks for ways with similar names that may have been misspelled."
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 "Dieser Test prüft auf ähnlich benannte Wege, was auf Schreibfehler hinweisen "
@@ -5507,5 +5549,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Dieser Test prüft auf ungetaggte Knoten, die nicht Teil eines Weges sind."
+msgstr ""
+"Dieser Test prüft auf ungetaggte Knoten, die nicht Teil eines Weges sind."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
@@ -5596,5 +5639,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:411
 msgid "Validate property values and tags using complex rules."
-msgstr "Prüft die Gültigkeit von Werten und Schlüsseln anhand von komplexen Regeln."
+msgstr ""
+"Prüft die Gültigkeit von Werten und Schlüsseln anhand von komplexen Regeln."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
@@ -5849,5 +5893,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
+msgstr ""
+"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6051,6 +6096,8 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:86
 #, java-format
-msgid "The selection contains {0} way. Are you sure you want to simplify them all?"
-msgid_plural "The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgid ""
+"The selection contains {0} way. Are you sure you want to simplify them all?"
+msgid_plural ""
+"The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
 "Diese Auswahl enthält {0} Weg. Sind Sie sich, dass alle vereinfacht werden "
@@ -6370,5 +6417,6 @@
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
 msgid "Please select the site(s) to check for updates."
-msgstr "Bitte die Quelle(n) auswählen, bei denen nach Updates gesucht werden soll."
+msgstr ""
+"Bitte die Quelle(n) auswählen, bei denen nach Updates gesucht werden soll."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
@@ -6496,5 +6544,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
-msgid "The requested area is too big. Please zoom in a little, or change resolution"
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 "Das angeforderte Gebiet ist zu groß. Zoomen Sie ein wenig oder ändern Sie "
@@ -6631,5 +6680,6 @@
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
 msgid "Set start/end for autorouting. Middle Mouse button to reset."
-msgstr "Setze Anfang/Ende für Routenberechnung. Zurücksetzen mit mittlerer Maustaste."
+msgstr ""
+"Setze Anfang/Ende für Routenberechnung. Zurücksetzen mit mittlerer Maustaste."
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
@@ -6646,9 +6696,9 @@
 msgstr "Navigieren"
 
-#: surveyor.java:6
+#: surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Tunnelanfang"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6661,65 +6711,65 @@
 msgstr "Brücke"
 
-#: surveyor.java:16
+#: surveyor.java:33
 msgid "Village/City"
 msgstr "Stadt"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Parken"
 
-#: surveyor.java:29
+#: surveyor.java:46
 msgid "One Way"
 msgstr "Einbahn"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr "Kirche"
 
-#: surveyor.java:38
+#: surveyor.java:55
 msgid "Fuel Station"
 msgstr "Tankstelle"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Hotel"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Restaurant"
 
-#: surveyor.java:52
+#: surveyor.java:69
 msgid "Shopping"
 msgstr "Einkaufen"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr "WC"
 
-#: surveyor.java:60
+#: surveyor.java:77
 msgid "Camping"
 msgstr "Camping"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Autobahn"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Bundesstraße"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Landesstraße"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Ohne Klassifikation"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "Ortsstraße"
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 msgid "Test"
 msgstr "Test"
@@ -10579,3 +10629,2 @@
 msgid "could not get audio input stream from input URL"
 msgstr "Konnte aus Eingabe-Datei keine Audiodaten lesen."
-
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 12493)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 12505)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
-"PO-Revision-Date: 14/10/2006 18:36+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
+"PO-Revision-Date: 2008-12-22 18:36+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
 "Language-Team: English/GB <josm-en_gb@eigenheimstrasse.de>\n"
@@ -1235,5 +1235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -4119,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Exit"
@@ -6715,10 +6715,10 @@
 msgstr ""
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "unnamed"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6731,72 +6731,72 @@
 msgstr ""
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "image"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 #, fuzzy
 msgid "Parking"
 msgstr "string"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "new"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Selection"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 #, fuzzy
 msgid "Hotel"
 msgstr "Help"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr ""
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Do nothing"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Connection"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr ""
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr ""
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr ""
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 12493)
+++ applications/editors/josm/i18n/po/fr.po	(revision 12505)
@@ -1,17 +1,18 @@
 # translation of fr.po to
-# Frederic Bonifas <fredericbonifas@gmail.com>, 2006. <>, 2006.
 #
+# Frederic Bonifas <fredericbonifas@gmail.com>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
-"PO-Revision-Date: 2008-11-19 22:37+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
+"PO-Revision-Date: 2008-12-23 12:27+0100\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
-"Language-Team: French <josm-fr@eigenheimstrasse.de>\n"
+"Language-Team: Fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
@@ -22,6 +23,6 @@
 "\n"
 msgstr ""
-"L'attribution du raccourci claver ''{0}'' à l'action ''{1}'' ({2}) a échoué\n"
-"car ce raccourci est déjà utilisé par l'action ''{3}'' ({4}).\n"
+"L’attribution du raccourci claver ''{0}'' à l’action ''{1}'' ({2}) a échoué\n"
+"car ce raccourci est déjà utilisé par l’action ''{3}'' ({4}).\n"
 "\n"
 
@@ -31,5 +32,5 @@
 "\n"
 msgstr ""
-"Cette action n'aura aucun raccourci.\n"
+"Cette action n’aura aucun raccourci.\n"
 "\n"
 
@@ -65,10 +66,10 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"Une exception inattendue pouvant provenir du greffon \"{0}\" s'est produite."
+"Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
-msgstr "D'après les informations du greffon, l'auteur est {0}."
+msgstr "D’après les informations du greffon, l’auteur est {0}."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
@@ -140,5 +141,5 @@
 msgstr ""
 "<html>Veuillez ouvrir un ticket ici : {0}<br>Incluez les étapes pour obtenir "
-"l'erreur (aussi détaillées que possible)<br>Assrez-vous d'inclure les "
+"l’erreur (aussi détaillées que possible)<br>Assrez-vous d’inclure les "
 "informations suivantes :</html>"
 
@@ -149,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:297
 msgid "This is after the end of the recording"
-msgstr "Ceci est après la fin de l'enregistrement"
+msgstr "Ceci est après la fin de l’enregistrement"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:337
@@ -182,5 +183,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
-msgstr "Erreur pendant l'analyse."
+msgstr "Erreur pendant l’analyse."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
@@ -205,14 +206,14 @@
 #, fuzzy
 msgid "Found <nd> element in non-way."
-msgstr "<nd> élément trouvé en dehors d'un chemin."
+msgstr "<nd> élément trouvé en dehors d’un chemin."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
 msgid "<nd> has zero ref"
-msgstr "<nd> n'a pas de ref"
+msgstr "<nd> n’a pas de ref"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #, fuzzy
 msgid "Found <member> tag on non-relation."
-msgstr "Étiquette <member> trouvée en dehors d'une relation"
+msgstr "Étiquette <member> trouvée en dehors d’une relation"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
@@ -223,5 +224,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
 msgid "Illegal object with id=0"
-msgstr "L'objet avec l'id=0 est illégal"
+msgstr "L’objet avec l’id=0 est illégal"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
@@ -237,5 +238,5 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
-"Erreur de traitement : la structure du document n'est pas valide pour un "
+"Erreur de traitement : la structure du document n’est pas valide pour un "
 "document gpx"
 
@@ -261,5 +262,5 @@
 #, fuzzy, java-format
 msgid "An error occoured: {0}"
-msgstr "Une erreur s'est produite : {0}"
+msgstr "Une erreur s’est produite : {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
@@ -298,14 +299,14 @@
 msgid "Transfer aborted due to error (will wait for 5 seconds):"
 msgstr ""
-"Le transfert a échoué à cause d'une erreur (nouvel essai dans 5 secondes) :"
+"Le transfert a échoué à cause d’une erreur (nouvel essai dans 5 secondes) :"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
 msgid "Incorrect password or username."
-msgstr "Mot de passe ou nom d'utilisateur incorrect."
+msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
 msgid "Username"
-msgstr "Nom d'utilisateur"
+msgstr "Nom d’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
@@ -320,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Save user and password (unencrypted)"
-msgstr "Sauvegarder l'utilisateur et le mot de passe (non crypté)"
+msgstr "Sauvegarder l’utilisateur et le mot de passe (non crypté)"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:92
@@ -343,5 +344,5 @@
 "required."
 msgstr ""
-"Attention - le chargment de {0} greffon a été demandé. Ce greffon n'est plus "
+"Attention - le chargment de {0} greffon a été demandé. Ce greffon n’est plus "
 "nécessaire."
 
@@ -381,5 +382,5 @@
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
-"Indication : Certains changements viennent de l'envoi de nouvelles données "
+"Indication : Certains changements viennent de l’envoi de nouvelles données "
 "sur le serveur."
 
@@ -397,10 +398,10 @@
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignore l'URL malformé : \"{0}\""
+msgstr "Ignore l’URL malformé : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:489
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignore le fichier malformé d'URL : \"{0}\""
+msgstr "Ignore le fichier malformé d’URL : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:43
@@ -562,5 +563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
 msgid "Name of the user."
-msgstr "Nom de l'utilisateur"
+msgstr "Nom de l’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
@@ -572,5 +573,5 @@
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
-"Redimensionner l'applet aux proportions donnnées (format LARGEURxHAUTEUR)"
+"Redimensionner l’applet aux proportions donnnées (format LARGEURxHAUTEUR)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -606,5 +607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "any"
-msgstr "n'importe"
+msgstr "n’importe"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -677,10 +678,10 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utilser l'étiquette prédéfinie \"{0}\" du groupe \"{1}\""
+msgstr "Utilser l’étiquette prédéfinie \"{0}\" du groupe \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:391
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr "Utilser l'étiquette prédéfinie \"{0}\""
+msgstr "Utilser l’étiquette prédéfinie \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:433
@@ -692,5 +693,5 @@
 #, fuzzy, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "Impossible de lire le fichier d'étiquettes prédéfinies : {0}"
+msgstr "Impossible de lire le fichier d’étiquettes prédéfinies : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:510
@@ -713,5 +714,5 @@
 #, java-format
 msgid "Preset group ''{0}''"
-msgstr "Groupe d'étiquettes prédéfinies \"{0}\""
+msgstr "Groupe d’étiquettes prédéfinies \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:132
@@ -895,5 +896,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
 msgid "Please select the row to edit."
-msgstr "Sélectionnez l'étage à éditer."
+msgstr "Sélectionnez l’étage à éditer."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
@@ -903,5 +904,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Please select the row to delete."
-msgstr "Sélectionner l'étage à supprimer."
+msgstr "Sélectionner l’étage à supprimer."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
@@ -965,4 +966,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#, fuzzy
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -971,5 +973,5 @@
 "sensible way."
 msgstr ""
-"Ceci est l'éditeur basique de relation qui vous permet des changer les "
+"Ceci est l’éditeur basique de relation qui vous permet des changer les "
 "étiquette de la relation ainsi que les membres. En supplément, nous devrions "
 "avoir un éditeur intelligent qui détecte le type de relation et limite les "
@@ -982,5 +984,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 msgid "Tags (empty value deletes tag)"
-msgstr "Étiquettes (une valeur vide supprime l'étiquette)"
+msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
@@ -1033,4 +1035,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#, fuzzy
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
@@ -1055,5 +1058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
 msgid "There were conflicts during import."
-msgstr "Il y a eu des conflits pendant l'import."
+msgstr "Il y a eu des conflits pendant l’import."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
@@ -1087,5 +1090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 msgid "Display the history of all selected items."
-msgstr "Afficher l'historique des objets sélectionnés."
+msgstr "Afficher l’historique des objets sélectionnés."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102
@@ -1117,6 +1120,6 @@
 "in the history list."
 msgstr ""
-"Rétablir l'état des objets sélectionnés à la version sélectionnée dans "
-"l'historique."
+"Rétablir l’état des objets sélectionnés à la version sélectionnée dans "
+"l’historique."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137
@@ -1284,5 +1287,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1373,5 +1376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:211
 msgid "Synchronize Audio"
-msgstr "Synchronizer l'audio"
+msgstr "Synchronizer l’audio"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
@@ -1379,5 +1382,5 @@
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
-"Vous devez mettre l'audio en pause au moment où vous entendez votre signal "
+"Vous devez mettre l’audio en pause au moment où vous entendez votre signal "
 "de synchronisation."
 
@@ -1429,14 +1432,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Il y a eu une erreur en essayant d'afficher l'URL pour ce marqueur"
+msgstr "Il y a eu une erreur en essayant d’afficher l’URL pour ce marqueur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "(URL was: "
-msgstr "(L'URL était : "
+msgstr "(L’URL était : "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 #, fuzzy
 msgid "Error displaying URL"
-msgstr "Erreur d'affichage de l'URL"
+msgstr "Erreur d’affichage de l’URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
@@ -1471,5 +1474,5 @@
 "<br>If you want to upload traces, look here:"
 msgstr ""
-"<html>L'envoi de données GPS non mises en forme comme données<br>sur la "
+"<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
 "carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
 "regardez ici : "
@@ -1500,5 +1503,5 @@
 "care and check if it works as expected.</html>"
 msgstr ""
-"<html>Cette fonctionnalité n'a été ajoutée que récemment. À "
+"<html>Cette fonctionnalité n’a été ajoutée que récemment. À "
 "utiliser<br>prudemment et vérifier si cela marche comme attendu.</html>"
 
@@ -1754,5 +1757,5 @@
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Impossible de lire l'heure \"{0}\" du 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:124
@@ -1804,5 +1807,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:422
 msgid "Sync clock"
-msgstr "Synchroniser l'horloge"
+msgstr "Synchroniser l’horloge"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:479
@@ -1814,5 +1817,5 @@
 #, 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}\"."
+msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:487
@@ -1822,19 +1825,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
 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)"
+msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:492
 #, fuzzy
 msgid "GPS unit timezone (difference to photo)"
-msgstr "Zone horaire de l'unité GPS (différence avec la photo)"
+msgstr "Zone horaire de l’unité GPS (différence avec la photo)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
 msgid "Syncronize Time with GPS Unit"
-msgstr "Synchroniser l'heure avec l'unité GPS"
+msgstr "Synchroniser l’heure avec l’unité GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:516
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:518
 msgid "Time entered could not be parsed."
-msgstr "L'heure indiquée ne peut être analysée."
+msgstr "L’heure indiquée ne peut être analysée."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
@@ -1909,5 +1912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
 msgid "Could not write bookmark."
-msgstr "Impossible d'écrire un marque-page."
+msgstr "Impossible d’écrire un marque-page."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
@@ -1917,5 +1920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
 msgid "The name of the object at the mouse pointer."
-msgstr "Nom de l'objet au niveau du pointeur de souris."
+msgstr "Nom de l’objet au niveau du pointeur de souris."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
@@ -1925,9 +1928,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The angle between the previous and the current way segment."
-msgstr "Angle entre le segment de chemin précédent et l'actuel;"
+msgstr "Angle entre le segment de chemin précédent et l’actuel;"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The (compass) heading of the line segment being drawn."
-msgstr "L'orientation (boussole) du segment en train d'être dessiné."
+msgstr "L’orientation (boussole) du segment en train d’être dessiné."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
@@ -1938,5 +1941,5 @@
 #, fuzzy
 msgid "(no object)"
-msgstr "(pas d'objet)"
+msgstr "(pas d’objet)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
@@ -2071,9 +2074,9 @@
 #, fuzzy
 msgid "The base URL for the OSM server (REST API)"
-msgstr "L'URL de base du serveur OSM (REST API)"
+msgstr "L’URL de base du serveur OSM (REST API)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 msgid "Login name (email) to the OSM account."
-msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
+msgstr "Nom d’utilisateur (e-mail) de votre compte OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -2081,5 +2084,5 @@
 "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 "
+"Mot de passe d’identification au compte OSM. Laisser blanc pour ne stocker "
 "aucun mot de passe."
 
@@ -2090,5 +2093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "OSM username (email)"
-msgstr "Nom d'utilisateur OSM (e-mail)"
+msgstr "Nom d’utilisateur OSM (e-mail)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -2104,9 +2107,9 @@
 "<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>"
+"encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de valeur.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:43
 msgid "Enable built-in defaults"
-msgstr "Activer les propositions d'étiquettes par défaut"
+msgstr "Activer les propositions d’étiquettes par défaut"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
@@ -2123,10 +2126,10 @@
 msgstr ""
 "Sources (URL ou fichier) des fichiers des étiquettes prédéfinies. Voir See "
-"http://josm.openstreetmap.de/wiki/TaggingPresets pour de l'aide (en anglais)."
+"http://josm.openstreetmap.de/wiki/TaggingPresets pour de l’aide (en anglais)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
 #, fuzzy
 msgid "Add a new tagging preset source to the list."
-msgstr "Ajouter un nouveau fichier d'étiquettes prédéfinies à la liste."
+msgstr "Ajouter un nouveau fichier d’étiquettes prédéfinies à la liste."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:92
@@ -2273,10 +2276,10 @@
 #, fuzzy, java-format
 msgid "Error deleting plugin file: {0}"
-msgstr "Erreur à la lecture du fichier d'information du greffon : {0}"
+msgstr "Erreur à la lecture du fichier d’information du greffon : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:336
 #, java-format
 msgid "Error reading plugin information file: {0}"
-msgstr "Erreur à la lecture du fichier d'information du greffon : {0}"
+msgstr "Erreur à la lecture du fichier d’information du greffon : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:364
@@ -2332,5 +2335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
 msgid "Proxy server username"
-msgstr "Nom d'utilisateur du serveur proxy"
+msgstr "Nom d’utilisateur du serveur proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
@@ -2374,5 +2377,5 @@
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
-"Début de la trace (fera toujours cela si aucun autre marqueur n'est "
+"Début de la trace (fera toujours cela si aucun autre marqueur n’est "
 "disponible)."
 
@@ -2402,11 +2405,11 @@
 "layer."
 msgstr ""
-"Faire automatiquement une couche de marqueurs à partir de n'importe quel "
-"point à l'ouverture d'une couche GPX."
+"Faire automatiquement une couche de marqueurs à partir de n’importe quel "
+"point à l’ouverture d’une couche GPX."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:91
 msgid "When importing audio, make markers from..."
 msgstr ""
-"Lors de l'import de fichiers audio, faire des marqueurs à partir de cela."
+"Lors de l’import de fichiers audio, faire des marqueurs à partir de cela."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:101
@@ -2414,5 +2417,5 @@
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
-"Lors de l'import de fichiers audio, appliquer cela à n'importe quel point de "
+"Lors de l’import de fichiers audio, appliquer cela à n’importe quel point de "
 "la couche GPX."
 
@@ -2440,9 +2443,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:143
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Quantité par laquelle la vitesse est multipliée pour l'avance rapide."
+msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144
 msgid "Fast forward multiplier"
-msgstr "Multiplicateur d'avance rapide"
+msgstr "Multiplicateur d’avance rapide"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:148
@@ -2461,14 +2464,14 @@
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
-"Taux entre le temps écoulé par l'enregistreur de voix et le temps réellement "
+"Taux entre le temps écoulé par l’enregistreur de voix et le temps réellement "
 "écoulé."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:154
 msgid "Voice recorder calibration"
-msgstr "Calibration de l'enregistrement de la voix"
+msgstr "Calibration de l’enregistrement de la voix"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Display Settings"
-msgstr "Réglages de l'affichage"
+msgstr "Réglages de l’affichage"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
@@ -2476,5 +2479,5 @@
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr "Divers réglages de l'apparence de tout le programme."
+msgstr "Divers réglages de l’apparence de tout le programme."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
@@ -2494,5 +2497,5 @@
 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."
+"Réglages pour la projection de la carte et l’interprétation des données."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
@@ -2544,5 +2547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28
 msgid "Draw segment order numbers"
-msgstr "Afficher l'ordre des segments"
+msgstr "Afficher l’ordre des segments"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
@@ -2592,5 +2595,5 @@
 msgstr ""
 "Force le dessin de lignes si les données importées ne contiennent pas "
-"d'information sur les lignes."
+"d’information sur les lignes."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
@@ -2623,5 +2626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Draw the order numbers of all segments within their way."
-msgstr "Afficher l'ordre de tous les segments de ce chemin."
+msgstr "Afficher l’ordre de tous les segments de ce chemin."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
@@ -2651,5 +2654,5 @@
 #, fuzzy
 msgid "Toolbar"
-msgstr "Barre d'outils"
+msgstr "Barre d’outils"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:158
@@ -2659,9 +2662,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:199
 msgid "Toolbar customization"
-msgstr "Customisation de la barre d'outils"
+msgstr "Customisation de la barre d’outils"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:200
 msgid "Customize the elements on the toolbar."
-msgstr "Customiser les éléments de la barre d'outils."
+msgstr "Customiser les éléments de la barre d’outils."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:47
@@ -2717,5 +2720,5 @@
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
-"La valeur par défaut est actuellement inconnue (le réglage n'a pas encore "
+"La valeur par défaut est actuellement inconnue (le réglage n’a pas encore "
 "été utilisé)."
 
@@ -2760,11 +2763,12 @@
 msgstr ""
 "<p>De plus, les raccourcis sont activés lorsque les actions sont assignées à "
-"un bouton d'une entrée du menu pour la première fois. Certains de vos "
+"un bouton d’une entrée du menu pour la première fois. Certains de vos "
 "changements pourraient donc être activés même sans redémarrage --- mais "
-"également sans gestion des conflits avec les raccourcis existants. C'est une "
-"autre raison pour <b>redémarrer</b> JOSM après avoir fait n'importe quel "
+"également sans gestion des conflits avec les raccourcis existants. C’est une "
+"autre raison pour <b>redémarrer</b> JOSM après avoir fait n’importe quel "
 "changement ici.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170
+#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -2780,9 +2784,9 @@
 msgstr ""
 "<p>Vous pouvez remarquer que la liste de sélection des clés sur la page "
-"suivante liste toutes les touches que Java connait sur n'importe quel type "
-"de clavier, et pas uniquement les touches de votre clavier. N'utilisez que "
-"les touches existant vraiment sur cotre clavier. Ainsi, si votre clavier n'a "
-"pas de touche 'Copy' (les claviers de PC n'en ont pas mais les claviers Sun "
-"en ont), ne l'utilisez pas. N'utilisez pas non plus une touche qui "
+"suivante liste toutes les touches que Java connait sur n’importe quel type "
+"de clavier, et pas uniquement les touches de votre clavier. N’utilisez que "
+"les touches existant vraiment sur cotre clavier. Ainsi, si votre clavier n’a "
+"pas de touche 'Copy’ (les claviers de PC n’en ont pas mais les claviers Sun "
+"en ont), ne l’utilisez pas. N’utilisez pas non plus une touche qui "
 "correspond à un raccourcie de votre claiver. Ne pas respecter cela pourra "
 "aboutir sur des conflits, JOS ne savant par exemple pas que Ctrl+Maj+; et "
@@ -2808,9 +2812,10 @@
 "automatiquement à des raccourcis. Pour chacun des quatre types de "
 "raccourcis, il y a trois alternatives. JOSM essaiera ces alternatives dans "
-"l'ordre de la listepour essayer de résoudre un conflit. Si toutes les "
+"l’ordre de la listepour essayer de résoudre un conflit. Si toutes les "
 "alternatives sont des raccourcis déjà utilisés, JOSM assignera un raccourci "
 "au hasard.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
+#, fuzzy
 msgid ""
 "<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
@@ -2839,5 +2844,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
-msgstr "Attention : n'utilisez que les touches réelles de votre clavier !"
+msgstr "Attention : n’utilisez que les touches réelles de votre clavier !"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:247
@@ -2894,5 +2899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:250
 msgid "layer not in list."
-msgstr "la couche n'est pas dans la liste."
+msgstr "la couche n’est pas dans la liste."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
@@ -2922,5 +2927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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)"
+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:112
@@ -2938,4 +2943,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#, fuzzy
 msgid "Don't launch in fullscreen mode"
 msgstr "Ne pas lancer en plein écran"
@@ -2959,7 +2965,7 @@
 "some data before --selection"
 msgstr ""
-"Les paramètres sont lus dans l'ordre dans lequel ils sont spécifiés, soyez "
+"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"
+"sur d’avoir chargé des données avant --selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
@@ -2976,6 +2982,6 @@
 "overwrite the existing ones."
 msgstr ""
-"L'activation des greffons mis à jour a échoué. Vérifiez si JOSM a "
-"l'autorisation de remplacer les greffons existants."
+"L’activation des greffons mis à jour a échoué. Vérifiez si JOSM a "
+"l’autorisation de remplacer les greffons existants."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
@@ -2990,5 +2996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
 msgid "Creating main GUI"
-msgstr "Création de l'environnement graphique (GUI)"
+msgstr "Création de l’environnement graphique (GUI)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
@@ -3018,5 +3024,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
 msgid "Error while parsing"
-msgstr "Erreur d'analyse"
+msgstr "Erreur d’analyse"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
@@ -3028,5 +3034,5 @@
 #, fuzzy, java-format
 msgid "An error occured in plugin {0}"
-msgstr "Une erreur s'est produite avec le greffon {0}"
+msgstr "Une erreur s’est produite avec le greffon {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
@@ -3146,4 +3152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:342
+#, fuzzy
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3152,5 +3159,5 @@
 msgstr ""
 "Vous êtes sur le point de supprimer des noeuds en dehors de la zone "
-"téléchargée. <br>Cela peut poser problème car d'autres objets (que vous ne "
+"téléchargée. <br>Cela peut poser problème car d’autres objets (que vous ne "
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
@@ -3217,6 +3224,6 @@
 "des latitudes entre 46.1° et 57° seulement.\n"
 "Utiliser un autre système de projection si vous\n"
-"n'utilisez pas un serveur WMS français.\n"
-"N'envoyez aucune donnée après ce message."
+"n’utilisez pas un serveur WMS français.\n"
+"N’envoyez aucune donnée après ce message."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
@@ -3230,5 +3237,5 @@
 "IMPORTANT : données positionnées loin des\n"
 "limites actuelles de la zone Lambert.\n"
-"N'envoyez aucune donnée après ce message.\n"
+"N’envoyez aucune donnée après ce message.\n"
 "Annulez votre dernière action, sauvegardez votre\n"
 "travail et ouvrez une noouvelle couche sur cette zone."
@@ -3254,5 +3261,5 @@
 #, fuzzy, java-format
 msgid "Could not upload preferences. Reason: {0}"
-msgstr "Impossible d'envoyer les préférences. Raison : {0}"
+msgstr "Impossible d’envoyer les préférences. Raison : {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
@@ -3298,5 +3305,5 @@
 #, fuzzy
 msgid "waterway"
-msgstr "voie d'eau"
+msgstr "voie d’eau"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:111
@@ -3357,5 +3364,5 @@
 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"
+"Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:176
@@ -3396,10 +3403,10 @@
 #, fuzzy
 msgid "OSM History Information"
-msgstr "Informations sur l'historique d'OSM"
+msgstr "Informations sur l’historique d’OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways or nodes."
 msgstr ""
-"Afficher des informations sur l'historique des chemins et des noeuds d'OSM."
+"Afficher des informations sur l’historique des chemins et des noeuds d’OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
@@ -3450,5 +3457,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
 msgid "Display the about screen."
-msgstr "Afficher l'à propos."
+msgstr "Afficher l’à propos."
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
@@ -3469,5 +3476,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:125
 msgid "Homepage"
-msgstr "Page d'accueil"
+msgstr "Page d’accueil"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:127
@@ -3518,5 +3525,5 @@
 "combine them?"
 msgstr ""
-"Les chemins sélectionnés ne sont pas les mêmes membres d'une relation. "
+"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
 "Voulez-vous encore les fusionner ?"
 
@@ -3524,5 +3531,5 @@
 msgid "Combine ways with different memberships?"
 msgstr ""
-"Fusionner des chemins qui ne sont pas les mêmes membres d'une relation ?"
+"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
@@ -3578,5 +3585,5 @@
 #, fuzzy
 msgid "OSM Server Files (*.osm *.xml)"
-msgstr "Fichiers d'un serveur OSM (*.osm *.xml)"
+msgstr "Fichiers d’un serveur OSM (*.osm *.xml)"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
@@ -3596,5 +3603,5 @@
 "tracks."
 msgstr ""
-"Note : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
+"Note : La GPL n’est pas compatible avec la licence d’OSM. Ne pas importer "
 "des traces sous licence GPL."
 
@@ -3611,5 +3618,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
 msgid "Nothing to export. Get some data first."
-msgstr "Rien à exporter. Obtenez d'abord des données."
+msgstr "Rien à exporter. Obtenez d’abord des données."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
@@ -3619,5 +3626,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
 msgid "Add author information"
-msgstr "Ajouter des informations sur l'auteur"
+msgstr "Ajouter des informations sur l’auteur"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
@@ -3647,10 +3654,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
 msgid "Export options"
-msgstr "Options d'export"
+msgstr "Options d’export"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #, java-format
 msgid "Error while exporting {0}"
-msgstr "Erreur à l'export {0}"
+msgstr "Erreur à l’export {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:192
@@ -3697,6 +3704,6 @@
 msgid "The selected node is no inner part of any way."
 msgid_plural "The selected nodes are no inner part of any way."
-msgstr[0] "Le noeud sélectionné n'est pas à l'intérieur d'un chemin."
-msgstr[1] "Les noeuds sélectionnés ne sont pas à l'intérieur d'un chemin."
+msgstr[0] "Le noeud sélectionné n’est pas à l’intérieur d’un chemin."
+msgstr[1] "Les noeuds sélectionnés ne sont pas à l’intérieur d’un chemin."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
@@ -3705,5 +3712,5 @@
 "way also."
 msgstr ""
-"Il y a plus d'un chemin utilisant le(s) noeud(s) sélectionné(s). Il faut "
+"Il y a plus d’un chemin utilisant le(s) noeud(s) sélectionné(s). Il faut "
 "également sélectionner un chemin."
 
@@ -3770,5 +3777,5 @@
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Zoomer la vue sur"
+msgstr "Zoomer la vue sur {0}."
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:77
@@ -3831,14 +3838,14 @@
 #, fuzzy
 msgid "Upload these changes?"
-msgstr "Envoyer ces changements ?"
+msgstr "Envoyer ces changements?"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Nothing to upload. Get some data first."
-msgstr "Rien à envoyer. Obtenez d'abord des données."
+msgstr "Rien à envoyer. Obtenez d’abord des données."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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."
+"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
@@ -3925,10 +3932,10 @@
 #, java-format
 msgid "Could not read from url: \"{0}\""
-msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
 msgid "Parsing error in url: \"{0}\""
-msgstr "Erreur d'analyse dans l'URL : \"{0}\""
+msgstr "Erreur d’analyse dans l’URL : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
@@ -3971,12 +3978,12 @@
 "<b>)</b> to group expressions</li></ul></html>"
 msgstr ""
-"<html>FTexte de recherche:<ul><li><b>Grande Rue</b> - 'Grande' et 'Rue' dans "
-"n'importe quel clé ou nom.</li><li><b>\"Grande Rue\"</b> - 'Grande Rue' dans "
-"n'importe quel clé ou nom.</li><li><b>name:Gra</b> - 'Gra' n'importe où dans "
-"le nom.</li><li><b>-name:Gra</b> - 'Gra' n'est pas présent dans le nom.</"
-"li><li><b>foot:</b> - clé=foot avec n'importe quelle valeur.</li><li>Cibles "
-"spéciales :</li><li><b>type:</b> - type de l'objet (<b>node</b>, <b>way</b>, "
+"<html>FTexte de recherche:<ul><li><b>Grande Rue</b> - 'Grande’ et 'Rue’ dans "
+"n’importe quel clé ou nom.</li><li><b>\"Grande Rue\"</b> - 'Grande Rue’ dans "
+"n’importe quel clé ou nom.</li><li><b>name:Gra</b> - 'Gra’ n’importe où dans "
+"le nom.</li><li><b>-name:Gra</b> - 'Gra’ n’est pas présent dans le nom.</"
+"li><li><b>foot:</b> - clé=foot avec n’importe quelle valeur.</li><li>Cibles "
+"spéciales :</li><li><b>type:</b> - type de l’objet (<b>node</b>, <b>way</b>, "
 "<b>relation</b>)</li><li><b>user:</b>... - tous les objets modifiés par "
-"l'utilisateur</li><li><b>id:</b>... - objet avec l'ID donné</li><li><b>nodes:"
+"l’utilisateur</li><li><b>id:</b>... - objet avec l’ID donné</li><li><b>nodes:"
 "</b>... - objets avec le nombre de noeuds donné</li><li><b>modified</b> - "
 "tous les objets modifiés</li><li><b>incomplete</b> - tous les objets "
@@ -4010,10 +4017,10 @@
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Rien n'a été ajouté à la sélection en recherchant \"{0}\""
+msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Rien n'a été enlevé à la sélection en recherchant \"{0}\""
+msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:167
@@ -4130,5 +4137,5 @@
 #, fuzzy
 msgid "An error occurred while saving."
-msgstr "Une erreur s'est produite pendant la sauvegarde."
+msgstr "Une erreur s’est produite pendant la sauvegarde."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
@@ -4136,5 +4143,5 @@
 #, fuzzy
 msgid "An error occurred while restoring backup file."
-msgstr "Une erreur s'est produite pendant la restauration du fichier récupéré."
+msgstr "Une erreur s’est produite pendant la restauration du fichier récupéré."
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
@@ -4167,4 +4174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:129
+#, fuzzy
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -4181,5 +4189,5 @@
 msgstr ""
 "Déplacer le curseur de lecture et le relacher à côté de la trace pour lire "
-"la piste audio à partir d'ici; Maj+relachement pour synchroniser la piste "
+"la piste audio à partir d’ici; Maj+relachement pour synchroniser la piste "
 "audio à ce point."
 
@@ -4237,5 +4245,5 @@
 #, fuzzy
 msgid "Cannot add a node outside of the world."
-msgstr "Impossible d'ajouter un noeud en dehors de la Terre."
+msgstr "Impossible d’ajouter un noeud en dehors de la Terre."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:316
@@ -4310,5 +4318,5 @@
 msgstr ""
 "Déplacer les objets en déplaçant la souris; Maj pour ajouter à la sélection "
-"(Ctrl pour l'enlever); Shift-Ctrl pour tourner la sélection; ou changer la "
+"(Ctrl pour l’enlever); Shift-Ctrl pour tourner la sélection; ou changer la "
 "sélection"
 
@@ -4333,5 +4341,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Quitter"
@@ -4339,5 +4347,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 msgid "Exit the application."
-msgstr "Quitter l'application."
+msgstr "Quitter l’application."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -4361,5 +4369,5 @@
 "to merge them?"
 msgstr ""
-"Les noeuds sélectionnés ne sont pas les mêmes membres d'une relation. Voulez-"
+"Les noeuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-"
 "vous encore les fusionner ?"
 
@@ -4367,5 +4375,5 @@
 msgid "Merge nodes with different memberships?"
 msgstr ""
-"Fusionner des noeuds qui ne sont pas les mêmes membres d'une relation ?"
+"Fusionner des noeuds qui ne sont pas les mêmes membres d’une relation ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:234
@@ -4609,13 +4617,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68
 msgid "This node is not glued to anything else."
-msgstr "Ce noeud n'est pas collé à quelque chose d'autre."
+msgstr "Ce noeud n’est pas collé à quelque chose d’autre."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
 msgid "None of these nodes is glued to anything else."
-msgstr "Aucun de ces noeuds n'est collé à quelque chose d'autre."
+msgstr "Aucun de ces noeuds n’est collé à quelque chose d’autre."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
+#, fuzzy
 msgid "None of this way's nodes is glued to anything else."
-msgstr "Aucun des noeuds de ce chemin n'est collé à quelque chose d'autre."
+msgstr "Aucun des noeuds de ce chemin n’est collé à quelque chose d’autre."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99
@@ -4630,9 +4639,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
 msgid "* One node that is used by more than one way, or"
-msgstr "* Un noeud est utilisé par plus d'un chemin, ou"
+msgstr "* Un noeud est utilisé par plus d’un chemin, ou"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "* Un noeud est utilisé par plus d'un chemin et un de ces chemins, ou"
+msgstr "* Un noeud est utilisé par plus d’un chemin et un de ces chemins, ou"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
@@ -4640,10 +4649,10 @@
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
-"* Un chemin qui a un ou plus de noeuds utilisés par plus d'un chemin, ou"
+"* Un chemin qui a un ou plus de noeuds utilisés par plus d’un chemin, ou"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
-msgstr "* Un noeud et un ou plus de ses noeuds utilisés par plus d'un chemin."
+msgstr "* Un noeud et un ou plus de ses noeuds utilisés par plus d’un chemin."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
@@ -4849,4 +4858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+#, fuzzy
 msgid "Don't apply changes"
 msgstr "Ne pas appliquer les changements"
@@ -4869,5 +4879,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
 msgid "Automatic tag correction"
-msgstr "Correction automatique d'étiquette"
+msgstr "Correction automatique d’étiquette"
 
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
@@ -5002,5 +5012,5 @@
 #, fuzzy
 msgid "Tagging Preset Tester"
-msgstr "Testeur d'étiquettes prédéfinies"
+msgstr "Testeur d’étiquettes prédéfinies"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
@@ -5009,5 +5019,5 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
-"Ouvrir le testeur d'étiquettes prédéfinies pour prévisualiser les fenêtres "
+"Ouvrir le testeur d’étiquettes prédéfinies pour prévisualiser les fenêtres "
 "de dialogue."
 
@@ -5016,5 +5026,5 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-"Vous devez d'abord spécifier la source des étiquettes prédéfinies dans les "
+"Vous devez d’abord spécifier la source des étiquettes prédéfinies dans les "
 "préférences."
 
@@ -5056,5 +5066,5 @@
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
-"Il a été demandé à Remote Control de télécharger des données depuis l'API. "
+"Il a été demandé à Remote Control de télécharger des données depuis l’API. "
 "Détails de la requête : {0}. Voulez-vous autoriser cela ?"
 
@@ -5072,5 +5082,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212
 msgid "Confirm Remote Control action"
-msgstr "Confirmer l'action Remote Control"
+msgstr "Confirmer l’action Remote Control"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209
@@ -5078,10 +5088,10 @@
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
-"Il a été demandé à Remote Control de télécharger des données depuis l'API. "
+"Il a été demandé à Remote Control de télécharger des données depuis l’API. "
 "Détails de la requête : {0}. Voulez-vous autoriser cela ?"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
 msgid "load data from API"
-msgstr "chargement des données depuis l'API"
+msgstr "chargement des données depuis l’API"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -5101,5 +5111,5 @@
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
-"Un greffon permettant à JOSM d'être contrôlé par d'autres applications."
+"Un greffon permettant à JOSM d’être contrôlé par d’autres applications."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
@@ -5145,5 +5155,5 @@
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:206
 msgid "Enter a place name to search for:"
-msgstr "Entrez un nom d'endroit à rechercher : "
+msgstr "Entrez un nom d’endroit à rechercher : "
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:218 presets.java:2449
@@ -5218,5 +5228,5 @@
 #, fuzzy, java-format
 msgid "Error creating cache directory: {0}"
-msgstr "Erreur à la lecture du fichier d'information du greffon : {0}"
+msgstr "Erreur à la lecture du fichier d’information du greffon : {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
@@ -5267,5 +5277,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
 msgid "Maximum gray value to count as water (0-255)"
-msgstr "Valeur de gris maximum à considérer comme de l'eau (0-255)"
+msgstr "Valeur de gris maximum à considérer comme de l’eau (0-255)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
@@ -5283,5 +5293,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Shift all traces to east (degrees)"
-msgstr "Décallage de toutes les traces vers l'est (en degrés)"
+msgstr "Décallage de toutes les traces vers l’est (en degrés)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
@@ -5330,5 +5340,5 @@
 "in the range 0-255. Default 90."
 msgstr ""
-"Valeur de gris maximum à accepter comme de l'eau (basée sur les données "
+"Valeur de gris maximum à accepter comme de l’eau (basée sur les données "
 "Landsat IR-1). Cette valeur peut se situer dans la pgae 0-255 (90 par "
 "défaut)."
@@ -5351,9 +5361,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Taille d'une dalle Landsat, mesurée en pixels (2000 par défaut)."
+msgstr "Taille d’une dalle Landsat, mesurée en pixels (2000 par défaut)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "Décallage de tous les points vers l'est en degrés (0 par défaut)."
+msgstr "Décallage de tous les points vers l’est en degrés (0 par défaut)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -5368,5 +5378,5 @@
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
-"Étiquetter les chemins comme de l'eau, des lignes côtières, de la terre ou "
+"Étiquetter les chemins comme de l’eau, des lignes côtières, de la terre ou "
 "rien du tout (eau par défaut)."
 
@@ -5387,6 +5397,6 @@
 msgid "An plugin to trace water bodies on Landsat imagery."
 msgstr ""
-"Module Python Lakewalker permettant de tracer les contours de l'eau à partir "
-"de l'imagerie Landsat.<br><br>Version : {0}"
+"Module Python Lakewalker permettant de tracer les contours de l’eau à partir "
+"de l’imagerie Landsat.<br><br>Version : {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
@@ -5487,5 +5497,5 @@
 " {1}"
 msgstr ""
-"Erreur du test d'initialisation {0} :\n"
+"Erreur du test d’initialisation {0} :\n"
 " {1}"
 
@@ -5503,5 +5513,5 @@
 #, fuzzy
 msgid "validation error"
-msgstr "validation d'erreur"
+msgstr "validation d’erreur"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
@@ -5512,5 +5522,5 @@
 #, fuzzy
 msgid "validation warning"
-msgstr "validation d'avertissement"
+msgstr "validation d’avertissement"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
@@ -5533,9 +5543,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use error layer."
-msgstr "Utiliser la couche d'erreurs."
+msgstr "Utiliser la couche d’erreurs."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the error layer to display problematic elements."
-msgstr "Utiliser la couche d'erreurs pour montrer les éléments problématiques."
+msgstr "Utiliser la couche d’erreurs pour montrer les éléments problématiques."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
@@ -5545,5 +5555,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "On upload"
-msgstr "À l'envoi"
+msgstr "À l’envoi"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:92
@@ -5553,5 +5563,5 @@
 msgstr ""
 "Un validateur des données OSM qui vérifie les erreurs communes commises par "
-"les utilisateurs et les programmes d'édition."
+"les utilisateurs et les programmes d’édition."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:94
@@ -5607,5 +5617,5 @@
 msgstr ""
 "Ce test vérifie que les chemins ne contiennent pas certains de leurs noeuds "
-"plus d'un fois."
+"plus d’un fois."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
@@ -5618,5 +5628,5 @@
 "layer, but are not connected by a node."
 msgstr ""
-"Ce test vérifie si deux routes, chemins de fer ou voies d'eau se croisent "
+"Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent "
 "sur le même calque sans être connectés par un noeud."
 
@@ -5703,5 +5713,5 @@
 #, fuzzy, java-format
 msgid "waterway type {0}"
-msgstr "type voie d'eau {0}"
+msgstr "type voie d’eau {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
@@ -5728,6 +5738,6 @@
 "than one way."
 msgstr ""
-"Ce test vérifie qu'une connexion entre deux noeuds n'est pas utilisé par "
-"plus d'un chemin."
+"Ce test vérifie qu’une connexion entre deux noeuds n’est pas utilisé par "
+"plus d’un chemin."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
@@ -5766,5 +5776,5 @@
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
-"Ce test vérifie la direction des chemins représentant de l'eau, de la terre "
+"Ce test vérifie la direction des chemins représentant de l’eau, de la terre "
 "ou des lignes de côte."
 
@@ -5772,13 +5782,13 @@
 msgid "Reversed coastline: land not on left side"
 msgstr ""
-"Ligne de côte inversée : la terre n'est pas sur le coté gauche du chemin"
+"Ligne de côte inversée : la terre n’est pas sur le coté gauche du chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed water: land not on left side"
-msgstr "Eau inversée : la terre n'est pas sur le coté gauche du chemin"
+msgstr "Eau inversée : la terre n’est pas sur le coté gauche du chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed land: land not on left side"
-msgstr "Terre inversée : la terre n'est pas sur le coté gauche du chemin"
+msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:43
@@ -5790,21 +5800,21 @@
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
-"Ce test vérifie si un chemin a son dernier point très près d'un autre chemin."
+"Ce test vérifie si un chemin a son dernier point très près d’un autre chemin."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:76
 msgid "Way end node near other highway"
-msgstr "Fin d'un chemin près d'une autre route"
+msgstr "Fin d’un chemin près d’une autre route"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:102
 msgid "Way end node near other way"
-msgstr "Fin d'un chemin près d'une autre chemin"
+msgstr "Fin d’un chemin près d’une autre chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:123
 msgid "Way node near other way"
-msgstr "Noeud d'un chemin à côté d'un autre chemin"
+msgstr "Noeud d’un chemin à côté d’un autre chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:141
 msgid "Connected way end node near other way"
-msgstr "point final d'un chemin connecté à côté d'un autre chemin"
+msgstr "point final d’un chemin connecté à côté d’un autre chemin"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -5842,5 +5852,5 @@
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr ""
-"Ce test vérifié les noeuds sans étiquette qui ne font pas partie d'un chemin."
+"Ce test vérifié les noeuds sans étiquette qui ne font pas partie d’un chemin."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
@@ -5860,10 +5870,10 @@
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Ligne du vérificateur d'étiquettes invalide - {0} : {1}"
+msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:224
 #, fuzzy, java-format
 msgid "Invalid spellcheck line: {0}"
-msgstr "Ligne du vérificateur d'orthographe invalide - {0} : {1}"
+msgstr "Ligne du vérificateur d’orthographe invalide - {0} : {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:235
@@ -5873,5 +5883,5 @@
 "{0}"
 msgstr ""
-"Impossible d'accéder au(x) fichier(s) de données : \n"
+"Impossible d’accéder au(x) fichier(s) de données : \n"
 "{0}"
 
@@ -5952,5 +5962,5 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-"Les sources (URL ou nom de fichier) du test d'ortographe (voir http://wiki."
+"Les sources (URL ou nom de fichier) du test d’ortographe (voir http://wiki."
 "openstreetmap.org/index.php/User:JLS/speller) ou les fichiers des "
 "vérification des étiquettes."
@@ -5987,5 +5997,5 @@
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
-"Chercher les noeuds et chemins avec FIXME comme valeur pour n'importe quelle "
+"Chercher les noeuds et chemins avec FIXME comme valeur pour n’importe quelle "
 "étiquette."
 
@@ -6004,5 +6014,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527
 msgid "Use the default spellcheck file (recommended)."
-msgstr "Utiliser le fichier de vérification d'orthographe (recommandé)."
+msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
@@ -6017,5 +6027,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Could not find warning level"
-msgstr "Impossible de trouver le niveau d'avertissement"
+msgstr "Impossible de trouver le niveau d’avertissement"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
@@ -6141,5 +6151,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr "Ouvrir l'outil d'arpentage"
+msgstr "Ouvrir l’outil d’arpentage"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
@@ -6150,5 +6160,5 @@
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr "Impossible de lire la définition d'arpentage : {0}"
+msgstr "Impossible de lire la définition d’arpentage : {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
@@ -6189,5 +6199,5 @@
 #, fuzzy, java-format
 msgid "Error while exporting {0}: {1}"
-msgstr "Erreur à l'export {0} : {1}"
+msgstr "Erreur à l’export {0} : {1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
@@ -6197,5 +6207,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
-msgstr "LiveGpsPlugin non trouvé, merci de l'installer et de l'activer."
+msgstr "LiveGpsPlugin non trouvé, merci de l’installer et de l’activer."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
@@ -6346,5 +6356,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
 msgid "delete data after import"
-msgstr "supprimer les données après l'import"
+msgstr "supprimer les données après l’import"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:47
@@ -6382,6 +6392,6 @@
 "plugin/"
 msgstr ""
-"Imoossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d'aide "
-"pour l'installer, essayez la page d'accueil deGlobalsat sur http://www."
+"Imoossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d’aide "
+"pour l’installer, essayez la page d’accueil deGlobalsat sur http://www."
 "raphael-mack.de/josm-globalsat-gpx-import-plugin/"
 
@@ -6421,5 +6431,5 @@
 #, fuzzy
 msgid "Please abort if you are not sure"
-msgstr "Merci d'abandonner si vous n'êtes pas sur."
+msgstr "Merci d’abandonner si vous n’êtes pas sur."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:81
@@ -6539,5 +6549,5 @@
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Le fichier {0} est maintenant chargé sous le nom \"{0}\""
+msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203
@@ -6547,6 +6557,6 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
-"<html>Prenez une photo de votre GPS quand il affiche l'heure.<br>Affichez "
-"votre photo ici.<br>Ensuite, entrez simplement l'heure que vous lisez sur la "
+"<html>Prenez une photo de votre GPS quand il affiche l’heure.<br>Affichez "
+"votre photo ici.<br>Ensuite, entrez simplement l’heure que vous lisez sur la "
 "hpoto et sélectionnez un fuseau horaire.<hr></html>"
 
@@ -6564,4 +6574,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256
+#, fuzzy
 msgid "I'm in the timezone of: "
 msgstr "Je suis dans le fuseau horaire de : "
@@ -6579,5 +6590,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr "Synchroniser l'heure avec une photo du GPS"
+msgstr "Synchroniser l’heure avec une photo du GPS"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
@@ -6587,5 +6598,5 @@
 msgstr ""
 "Erreur pour analyser la date.\n"
-"Merci d'utiliser le format demandé"
+"Merci d’utiliser le format demandé"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389
@@ -6750,5 +6761,5 @@
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
 msgid "Update Site Url"
-msgstr "Mettre à jour l'URL du site"
+msgstr "Mettre à jour l’URL du site"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
@@ -6802,5 +6813,5 @@
 "the preferences."
 msgstr ""
-"Firefox non trouvé. Réglez l'exécutable Firefox dans la page Réglages de la "
+"Firefox non trouvé. Réglez l’exécutable Firefox dans la page Réglages de la "
 "carte des Préférences."
 
@@ -6819,6 +6830,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
+#, fuzzy
 msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
-msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer"
+msgstr "Télécharger une image rectifiée sur le WMS Metacarta’s Map Rectifer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
@@ -6887,5 +6899,5 @@
 #, fuzzy
 msgid "Please select the row to copy."
-msgstr "Sélectionnez l'étage à éditer."
+msgstr "Sélectionnez l’étage à éditer."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18
@@ -6952,5 +6964,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:53
 msgid "Exception occurred"
-msgstr "Une exception s'est produite"
+msgstr "Une exception s’est produite"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
@@ -6972,4 +6984,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
+#, fuzzy
 msgid ""
 "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
@@ -6997,5 +7010,5 @@
 "use."
 msgstr ""
-"Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
+"Vous pouvez ajouter, éditer et supprimer des sources WMS dans l’onglet "
 "Préférences du greffon WMS - elles apparaitront ensuite dans le menu WMS.\n"
 "\n"
@@ -7006,5 +7019,5 @@
 "wmsplugin.url.2.name=NPE Maps... etc\n"
 "\n"
-"Exemple  d'URL WMS complet (landsat)\n"
+"Exemple  d’URL WMS complet (landsat)\n"
 "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
 "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
@@ -7012,13 +7025,13 @@
 "\n"
 "Pour Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , vous "
-"devez seulement entrer l' 'id' correspondant.\n"
+"devez seulement entrer l’ 'id’ correspondant.\n"
 "Pour ajouter une entrée Metacarta Map Rectifer dans le menu, créez "
-"manuellement l'URL comme dans cet exemple, en remplaçant 73 par l'id de "
+"manuellement l’URL comme dans cet exemple, en remplaçant 73 par l’id de "
 "votre image : \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 " \n"
-"Note : Assurez-vous que l'image est utilisable et sous une licence "
-"compatible. En cas de doute, ne l'utilisez pas."
+"Note : Assurez-vous que l’image est utilisable et sous une licence "
+"compatible. En cas de doute, ne l’utilisez pas."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
@@ -7029,5 +7042,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr "Position d'origine de la grille"
+msgstr "Position d’origine de la grille"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
@@ -7056,5 +7069,5 @@
 msgid "Set start/end for autorouting. Middle Mouse button to reset."
 msgstr ""
-"Régler le début et la fin pour le calcul d'itinéraire automatique. Bouton du "
+"Régler le début et la fin pour le calcul d’itinéraire automatique. Bouton du "
 "milieu pour remettre à zéro."
 
@@ -7072,10 +7085,10 @@
 msgstr "Naviguer"
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "Tunnel"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -7088,72 +7101,72 @@
 msgstr "Pont"
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "Village"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 #, fuzzy
 msgid "Parking"
 msgstr "Parking"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "Sens unique"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Caserne de pompiers"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 #, fuzzy
 msgid "Hotel"
 msgstr "Hôtel"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Restaurant"
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Tir sportif"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Camping"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Autoroute"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Route primaire"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Route secondaire"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Route mineure"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "Rue résidentielle"
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
@@ -7261,9 +7274,9 @@
 #: presets.java:59
 msgid "Motorway Link"
-msgstr "Bretelle d'accès d'autoroute"
+msgstr "Bretelle d’accès d’autoroute"
 
 #: presets.java:60
 msgid "Edit a Motorway Link"
-msgstr "Éditer une bretelle d'accès d'autoroute"
+msgstr "Éditer une bretelle d’accès d’autoroute"
 
 #: presets.java:76
@@ -7277,9 +7290,9 @@
 #: presets.java:95
 msgid "Trunk Link"
-msgstr "Bretelle d'accès à une voie rapide"
+msgstr "Bretelle d’accès à une voie rapide"
 
 #: presets.java:96
 msgid "Edit a Trunk Link"
-msgstr "Éditer une bretelle d'accès à une voie rapide"
+msgstr "Éditer une bretelle d’accès à une voie rapide"
 
 #: presets.java:116
@@ -7289,9 +7302,9 @@
 #: presets.java:134
 msgid "Primary Link"
-msgstr "Bretelle d'accès à une route primaire"
+msgstr "Bretelle d’accès à une route primaire"
 
 #: presets.java:135
 msgid "Edit a Primary Link"
-msgstr "Éditer une bretelle d'accès à une route primaire"
+msgstr "Éditer une bretelle d’accès à une route primaire"
 
 #: presets.java:152
@@ -7369,9 +7382,9 @@
 #, fuzzy
 msgid "Service"
-msgstr "Voie d'accès"
+msgstr "Voie d’accès"
 
 #: presets.java:243
 msgid "Edit a Serviceway"
-msgstr "Éditer une voie d'accès"
+msgstr "Éditer une voie d’accès"
 
 #: presets.java:261
@@ -7395,9 +7408,9 @@
 #, fuzzy
 msgid "Road Restrictions"
-msgstr "Restrictions d'une route"
+msgstr "Restrictions d’une route"
 
 #: presets.java:297
 msgid "Edit Road Restrictions"
-msgstr "Éditer les restrictions d'une route"
+msgstr "Éditer les restrictions d’une route"
 
 #: presets.java:299
@@ -7952,5 +7965,5 @@
 #, fuzzy
 msgid "Emergency Phone"
-msgstr "Point d'accès d'urgence"
+msgstr "Point d’accès d’urgence"
 
 #: presets.java:775
@@ -7990,5 +8003,5 @@
 #, fuzzy
 msgid "Edit a Stile"
-msgstr "Éditer un cours d'eau étroit"
+msgstr "Éditer un cours d’eau étroit"
 
 #: presets.java:805 presets.java:815 presets.java:825 presets.java:838
@@ -8169,5 +8182,5 @@
 #, fuzzy
 msgid "Waterway"
-msgstr "Voies d'eau"
+msgstr "Voies d’eau"
 
 #: presets.java:1025
@@ -8191,18 +8204,18 @@
 #: presets.java:1041
 msgid "Drain"
-msgstr "Canal d'évacuation"
+msgstr "Canal d’évacuation"
 
 #: presets.java:1042
 msgid "Edit a Drain"
-msgstr "Éditer un canal d'évacuation"
+msgstr "Éditer un canal d’évacuation"
 
 #: presets.java:1049
 #, fuzzy
 msgid "Stream"
-msgstr "Cours d'eau étroit"
+msgstr "Cours d’eau étroit"
 
 #: presets.java:1050
 msgid "Edit a Stream"
-msgstr "Éditer un cours d'eau étroit"
+msgstr "Éditer un cours d’eau étroit"
 
 #: presets.java:1059
@@ -8240,5 +8253,5 @@
 #: presets.java:1095
 msgid "Waterway Point"
-msgstr "Points sur voie d'eau"
+msgstr "Points sur voie d’eau"
 
 #: presets.java:1096
@@ -8677,9 +8690,9 @@
 #: presets.java:1459
 msgid "Guest House"
-msgstr "Chambre d'hôte"
+msgstr "Chambre d’hôte"
 
 #: presets.java:1460
 msgid "Edit Guest House"
-msgstr "Éditer une chambre d'hôte"
+msgstr "Éditer une chambre d’hôte"
 
 #: presets.java:1465
@@ -8951,17 +8964,17 @@
 #: presets.java:1572
 msgid "Theme Park"
-msgstr "Parc d'attraction"
+msgstr "Parc d’attraction"
 
 #: presets.java:1573
 msgid "Edit Theme Park"
-msgstr "Éditer un parc d'attraction"
+msgstr "Éditer un parc d’attraction"
 
 #: presets.java:1578
 msgid "Artwork"
-msgstr "Oeuvre d'art"
+msgstr "Oeuvre d’art"
 
 #: presets.java:1579
 msgid "Edit Artwork"
-msgstr "Éditer une oeuvre d'art"
+msgstr "Éditer une oeuvre d’art"
 
 #: presets.java:1586 presets.java:2278
@@ -9394,9 +9407,9 @@
 #: presets.java:1773
 msgid "Archery"
-msgstr "Tir à l'arc"
+msgstr "Tir à l’arc"
 
 #: presets.java:1774
 msgid "Edit Archery"
-msgstr "Éditer tir à l'arc"
+msgstr "Éditer tir à l’arc"
 
 #: presets.java:1780
@@ -9736,9 +9749,9 @@
 #: presets.java:2052
 msgid "Kindergarten"
-msgstr "Jardin d'enfants"
+msgstr "Jardin d’enfants"
 
 #: presets.java:2053
 msgid "Edit Kindergarten"
-msgstr "Éditer un jardin d'enfants"
+msgstr "Éditer un jardin d’enfants"
 
 #: presets.java:2058
@@ -9760,9 +9773,9 @@
 #: presets.java:2070
 msgid "College"
-msgstr "Établissement d'enseignement supérieur"
+msgstr "Établissement d’enseignement supérieur"
 
 #: presets.java:2071
 msgid "Edit College"
-msgstr "Éditer un établissement d'enseignement supérieur"
+msgstr "Éditer un établissement d’enseignement supérieur"
 
 #: presets.java:2078
@@ -9933,5 +9946,5 @@
 #, fuzzy
 msgid "Edit address information"
-msgstr "Éditer les informations d'adresse"
+msgstr "Éditer les informations d’adresse"
 
 #: presets.java:2115
@@ -9964,9 +9977,9 @@
 #: presets.java:2126
 msgid "Address Interpolation"
-msgstr "Interpolation d'adresse"
+msgstr "Interpolation d’adresse"
 
 #: presets.java:2127
 msgid "Edit address interpolation"
-msgstr "Éditer l'interpolation d'adresse"
+msgstr "Éditer l’interpolation d’adresse"
 
 #: presets.java:2129
@@ -10010,9 +10023,9 @@
 #: presets.java:2147
 msgid "Water Tower"
-msgstr "Château d'eau"
+msgstr "Château d’eau"
 
 #: presets.java:2148
 msgid "Edit Water Tower"
-msgstr "Éditer un château d'eau"
+msgstr "Éditer un château d’eau"
 
 #: presets.java:2153
@@ -10113,9 +10126,9 @@
 #: presets.java:2201
 msgid "Wastewater Plant"
-msgstr "Station d'épuration"
+msgstr "Station d’épuration"
 
 #: presets.java:2202
 msgid "Edit Wastewater Plant"
-msgstr "Éditer une station d'épuration"
+msgstr "Éditer une station d’épuration"
 
 #: presets.java:2207
@@ -10302,17 +10315,17 @@
 #: presets.java:2291
 msgid "Edit Drinking Water"
-msgstr "Éditer un point d'eau potable"
+msgstr "Éditer un point d’eau potable"
 
 #: presets.java:2296
 msgid "Baby Hatch"
-msgstr "Tour d'abandon"
+msgstr "Tour d’abandon"
 
 #: presets.java:2297
 msgid "Edit a Baby Hatch"
-msgstr "Éditer une tour d'abandon"
+msgstr "Éditer une tour d’abandon"
 
 #: presets.java:2300
 msgid "Opening Hours"
-msgstr "Horaires d'ouverture"
+msgstr "Horaires d’ouverture"
 
 #: presets.java:2304
@@ -10490,9 +10503,9 @@
 #: presets.java:2374
 msgid "Outdoor"
-msgstr "Magasin de sports d'extérieur"
+msgstr "Magasin de sports d’extérieur"
 
 #: presets.java:2375
 msgid "Edit Outdoor Shop"
-msgstr "Éditer un magasin de sports d'extérieur"
+msgstr "Éditer un magasin de sports d’extérieur"
 
 #: presets.java:2381
@@ -10577,9 +10590,9 @@
 #: presets.java:2429
 msgid "Emergency Access Point"
-msgstr "Point d'accès d'urgence"
+msgstr "Point d’accès d’urgence"
 
 #: presets.java:2430
 msgid "Edit Emergency Access Point"
-msgstr "Éditer point d'accès d'urgence"
+msgstr "Éditer point d’accès d’urgence"
 
 #: presets.java:2433
@@ -10751,5 +10764,5 @@
 #: presets.java:2566
 msgid "Edit National Park Boundary"
-msgstr "Éditer les frontières d'un parc national"
+msgstr "Éditer les frontières d’un parc national"
 
 #: presets.java:2573
@@ -10946,5 +10959,5 @@
 #: presets.java:2726
 msgid "Edit Grass Landuse"
-msgstr "Éditer de l'herbe"
+msgstr "Éditer de l’herbe"
 
 #: presets.java:2732
@@ -10967,5 +10980,5 @@
 #: presets.java:2742
 msgid "Edit Water"
-msgstr "Éditer de l'eau"
+msgstr "Éditer de l’eau"
 
 #: presets.java:2747
@@ -11036,9 +11049,9 @@
 #: presets.java:2795
 msgid "Scree"
-msgstr "Zone d'éboulements"
+msgstr "Zone d’éboulements"
 
 #: presets.java:2796
 msgid "Edit Scree"
-msgstr "Éditer une zone d'éboulements"
+msgstr "Éditer une zone d’éboulements"
 
 #: presets.java:2801
@@ -11246,6 +11259,3 @@
 #: specialmessages.java:9
 msgid "could not get audio input stream from input URL"
-msgstr "impossible d'obtenir un flux audio depuis l'URL"
-
-#~ msgid "En:"
-#~ msgstr "En :"
+msgstr "impossible d’obtenir un flux audio depuis l’URL"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 12493)
+++ applications/editors/josm/i18n/po/it.po	(revision 12505)
@@ -5,5 +5,5 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-12-20 09:32+0000\n"
 "Last-Translator: vincivis <Unknown>\n"
@@ -1225,5 +1225,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Informazioni"
@@ -4161,5 +4161,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Esci"
@@ -6759,10 +6759,10 @@
 msgstr "Naviga"
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "Galleria/tunnel"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6775,70 +6775,70 @@
 msgstr "Bridge"
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "Villaggio"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Parking"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "Senso unico"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Caserma dei Vigili del Fuoco"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Hotel"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Ristorante"
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Poligono di tiro"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Campeggio"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Motorway"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Primary"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Secondary"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Strada non classificata"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "Residential"
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 12493)
+++ applications/editors/josm/i18n/po/pl.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-11-04 22:17+0100\n"
 "Last-Translator: Marcin Floryan <mfloryan@mm.waw.pl>\n"
@@ -1213,5 +1213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -4020,5 +4020,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Zakończ"
@@ -6495,10 +6495,10 @@
 msgstr ""
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "tunel"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6511,70 +6511,70 @@
 msgstr "most"
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "wieś"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "parking"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "jednokierunkowa"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "straż pożarna"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Hotel"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "restauracja"
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "strzelectwo"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "pole namiotowe"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "autostrada"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "droga krajowa"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "droga wojewódzka"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "droga gminna"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "droga lokalna"
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 12493)
+++ applications/editors/josm/i18n/po/ro.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2006-10-14 10:09+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -1248,5 +1248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Informaţii"
@@ -4159,5 +4159,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Ieşire"
@@ -6758,10 +6758,10 @@
 msgstr ""
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "fără nume"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6774,72 +6774,72 @@
 msgstr ""
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "imagine"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 #, fuzzy
 msgid "Parking"
 msgstr "şir"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "nou"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Selecţie"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 #, fuzzy
 msgid "Hotel"
 msgstr "Ajutor"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr ""
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Nu fă nimic"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Conexiune"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr ""
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr ""
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr ""
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 12493)
+++ applications/editors/josm/i18n/po/ru.po	(revision 12505)
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the josm package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
-"PO-Revision-Date: 2008-10-17 20:46+0000\n"
-"Last-Translator: JekaDer <yourname@mail.ru>\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
+"PO-Revision-Date: 2008-12-15 22:55+0000\n"
+"Last-Translator: yohanson <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-10-17 20:48+0000\n"
+"X-Launchpad-Export-Date: 2008-12-23 10:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,4 +27,7 @@
 "\n"
 msgstr ""
+"Назначение комбинации клавиш ''{0}'' на действие ''{1}'' ({2}) невозможно,\n"
+"так как это сочетание уже используется действием ''{3}'' ({4}).\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
@@ -33,4 +36,6 @@
 "\n"
 msgstr ""
+"На это действие не будет назначено сочитания клавиш\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
@@ -40,8 +45,10 @@
 "\n"
 msgstr ""
+"Вместо этого, назначается сочетание ''{0}''\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr ""
+msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)"
 
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
@@ -121,5 +128,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:106
 msgid "Development version. Unknown revision."
-msgstr ""
+msgstr "Нестабильная версия. Неизвестная ревизия."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
@@ -135,7 +142,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:134
-#, fuzzy
 msgid "(The text has already been copied to your clipboard.)"
-msgstr "Текст уже скопирован в буфер обмена."
+msgstr "(Текст уже скопирован в буфер обмена)"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:297
@@ -145,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:337
 msgid "Error playing sound"
-msgstr ""
+msgstr "Ошибка при проигрывании звука"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40
@@ -225,7 +231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:27
-#, fuzzy
 msgid "Contacting Server..."
-msgstr "Подключение к серверу OSM..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
@@ -265,12 +270,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:283
-#, fuzzy
 msgid "Preparing..."
-msgstr "Подготовка данных..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:293
-#, fuzzy
 msgid "Uploading..."
-msgstr "Загрузка..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377
@@ -279,7 +282,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:640
-#, fuzzy
 msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Передача прервана из-за ошибки (следующая попытка через 5 секунд):"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
@@ -357,5 +359,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:389
 msgid "The projection could not be read from preferences. Using EPSG:4263."
-msgstr ""
+msgstr "Данные о проекции не найдены в параметрах. Используем EPSG:4263."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:461
@@ -408,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:133
 msgid "Bounding Box"
-msgstr ""
+msgstr "Рамка"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -508,5 +510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
 msgid "unset: do not set this property on the selected objects"
-msgstr "unset: не устанавливайте этот параметр на выбранных объектах"
+msgstr "unset: не устанавливать этот параметр у выбранных объектов"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
@@ -535,5 +537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
+msgstr "Изменить размер апплета на заданный (формат: ШИРИНАxВЫСОТА)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -563,9 +565,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "any"
-msgstr ""
+msgstr "любое"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
+msgstr "Если выбрано - установить настройки по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:53
@@ -579,7 +581,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#, fuzzy
 msgid "Move right"
-msgstr "Высота"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
@@ -589,22 +590,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "Map: {0}"
-msgstr "Название: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#, fuzzy
 msgid "Move left"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#, fuzzy
 msgid "Move up"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#, fuzzy
 msgid "Move down"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
@@ -631,10 +629,10 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Использовать предустановку ''{0}'' из группы ''{1}''"
+msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:391
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr "Использовать предустановку ''{0}''"
+msgstr "Использовать шаблон ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:433
@@ -705,12 +703,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137
 msgid "Presets"
-msgstr "Предустановки"
+msgstr "Шаблоны"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Menu: {0}"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210
@@ -719,7 +717,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
-#, fuzzy
 msgid "Toggle Wireframe view"
-msgstr "Каркас"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
@@ -785,4 +782,5 @@
 msgstr[0] "Изменить параметры {0} объекта"
 msgstr[1] "Изменить параметры {0} объектов"
+msgstr[2] "Изменить параметры {0} объектов"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
@@ -818,7 +816,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Toggle: {0}"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
@@ -856,7 +854,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
-#, fuzzy
 msgid "Add Properties"
-msgstr "Изменить параметры"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
@@ -865,7 +862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#, fuzzy
 msgid "Edit Properties"
-msgstr "Править трубопровод"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
@@ -874,7 +870,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
-#, fuzzy
 msgid "Delete Properties"
-msgstr "Изменить параметры"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
@@ -901,9 +896,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Create new relation"
-msgstr ""
+msgstr "Создать новое отношение"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 msgid "Edit new relation"
-msgstr ""
+msgstr "Править новое отношение"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
@@ -933,12 +928,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-#, fuzzy
 msgid "Move the currently selected member(s) up"
-msgstr "переместить выделенный слой вверх."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-#, fuzzy
 msgid "Move the currently selected member(s) down"
-msgstr "переместить выделенный слой вниз."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
@@ -948,5 +941,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
 msgid "Add all currently selected objects as members"
-msgstr ""
+msgstr "Сделать все выбранные объекты членами отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
@@ -955,7 +948,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
-#, fuzzy
 msgid "Delete all currently selected objects from relation"
-msgstr "Удалить выбранное отношение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
@@ -997,5 +989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
 msgid "Error parsing server response."
-msgstr ""
+msgstr "Ошибка при парсинге ответа от сервера."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
@@ -1043,5 +1035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
 msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
+msgstr "Перегрузить все выбранные объекты, и обновить список."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
@@ -1095,5 +1087,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:101
 msgid "Toggle visible state of the selected layer."
-msgstr "Переключать видимость выделенного слоя."
+msgstr "Показать/Скрыть выбранный слой"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:120
@@ -1103,5 +1095,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:121
 msgid "Toggle visible state of the marker text and icons."
-msgstr "Переключать состояние текста и значков маркеров."
+msgstr "Показать/Скрыть текст и значки маркеров."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:161
@@ -1166,5 +1158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 msgid "Selection: %d way(s) and %d node(s)"
-msgstr ""
+msgstr "Выбрано: %d линий и %d точек"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1193,5 +1185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 msgid "Open an editor for the selected relation"
-msgstr ""
+msgstr "Открыть редактор для выбранного отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -1201,5 +1193,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Сведения"
@@ -1208,9 +1200,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
-msgstr ""
+msgstr "Список изменений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 msgid "Open a list of all commands (undo buffer)."
-msgstr ""
+msgstr "Показать список всех действий (буфер омены)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
@@ -1249,5 +1241,6 @@
 msgid_plural "markers"
 msgstr[0] "маркер"
-msgstr[1] "маркеры"
+msgstr[1] "маркера"
+msgstr[2] "маркеров"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
@@ -1263,5 +1256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Customize Color"
-msgstr ""
+msgstr "Выбрать цвет"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
@@ -1344,5 +1337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "(URL was: "
-msgstr ""
+msgstr "(по ссылке: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
@@ -1495,5 +1488,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
 msgid "Customize line drawing"
-msgstr ""
+msgstr "Настроить отрисовку линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296
@@ -1505,15 +1498,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
 msgid "Draw lines between points for this layer."
-msgstr ""
+msgstr "Отображать линии между точками для этого слоя."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 msgid "Do not draw lines between points for this layer."
-msgstr ""
+msgstr "Не отображать линий между точками для этого слоя."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 msgid "Select line drawing options"
-msgstr ""
+msgstr "Выбрать варианты отрисовки линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
@@ -1565,6 +1558,7 @@
 msgid "{0} waypoint"
 msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} путевая точка"
+msgstr[1] "{0} путевые точки"
+msgstr[2] "{0} путевых точек"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
@@ -1597,12 +1591,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
-#, fuzzy
 msgid "Download from OSM along this track"
-msgstr "Скачать с OSM ..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:755
-#, fuzzy
 msgid "Download everything within:"
-msgstr "Загрузка данных"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:757
@@ -1659,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:124
 msgid "No images with readable timestamps found."
-msgstr ""
+msgstr "Не найдено изображений с информацией о времени."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:135
@@ -1711,10 +1703,10 @@
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
+msgstr "невозможно прочесть дату из файла \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:483
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
+msgstr "EXIF файла \"{0}\" не содержит информации о времени."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:487
@@ -1727,7 +1719,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:492
-#, fuzzy
 msgid "GPS unit timezone (difference to photo)"
-msgstr "Часовой пояс GPS приёмника (разница с фото)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
@@ -1747,7 +1738,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-#, fuzzy
 msgid "outside downloaded area"
-msgstr "Отображать границы скачанных данных"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:222
@@ -1760,5 +1750,6 @@
 msgid_plural "nodes"
 msgstr[0] "узел"
-msgstr[1] "узлы"
+msgstr[1] "узла"
+msgstr[2] "узлов"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
@@ -2155,7 +2146,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:293
-#, fuzzy, java-format
+#, java-format
 msgid "Error deleting plugin file: {0}"
-msgstr "Ошибка чтения файла с описанием модуля: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:336
@@ -2184,7 +2175,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:55
-#, fuzzy
 msgid "Language"
-msgstr "Землепользование"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:58
@@ -2295,16 +2285,19 @@
 "pressed"
 msgstr ""
+"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии "
+"соответствующей кнопки"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:139
 msgid "Forward/back time (seconds)"
-msgstr ""
+msgstr "Время перемотки (секунд)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:143
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
+"Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144
 msgid "Fast forward multiplier"
-msgstr ""
+msgstr "Множитель быстрого проигрывания"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:148
@@ -2358,5 +2351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Settings for the audio player and audio markers."
-msgstr ""
+msgstr "Параметры звукового проигрывателя, и звуковых маркеров."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:103
@@ -2371,5 +2364,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
 msgid "Force lines if no segments imported."
-msgstr ""
+msgstr "Отображать линии, даже если не импортировано сегментов."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
@@ -2394,8 +2387,10 @@
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
+"Показывать только полезные указатели направления (например, для "
+"односторонних дорог)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28
 msgid "Draw segment order numbers"
-msgstr ""
+msgstr "Отображать порядковые номера сегментов"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
@@ -2442,5 +2437,5 @@
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
-msgstr ""
+msgstr "Отображать линии, даже если не импортировано информации о линиях."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
@@ -2451,4 +2446,6 @@
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
+"Отображать стрелки направления, используя таблицы, вместо математических "
+"вычислений."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
@@ -2470,13 +2467,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
+msgstr "Применить сглаживание карты."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
+msgstr "Отображать границы области, скачанной с сервера."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
+msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
@@ -2517,7 +2514,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
-#, fuzzy
 msgid "Shortcut Preferences"
-msgstr "Настройки"
+msgstr "Настройки клавиш"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
@@ -2526,12 +2522,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:38
-#, fuzzy
 msgid "Action"
-msgstr "Достопримечательность"
+msgstr "Действие"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:38
-#, fuzzy
 msgid "Shortcut"
-msgstr "Спорт"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:38
@@ -2566,15 +2560,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:52
-#, fuzzy
 msgid "disabled"
-msgstr "масштаб"
+msgstr "отключено"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:53
 msgid "no modifier"
-msgstr ""
+msgstr "нет модификатора"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:164
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
-msgstr ""
+msgstr "<h1><a name=\"top\">Горячие клавиши</a></h1>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:165
@@ -2583,4 +2576,6 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
+"<p>Горячие клавиши назначаются при запуске JOSM. Пэтому, нужно "
+"<b>перезапустить</b> JOSM, чтобы изменения вступили в силу.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:167
@@ -2592,4 +2587,8 @@
 "</p>"
 msgstr ""
+"<p>Кроме того, горячие клавиши активируются, если назначаются для какого-"
+"либо меню, или кнопки впервые. Поэтому некоторые из них могут заработать без "
+"перезапуска --- но и без разрешения конфликтов. Это ещё один повод "
+"<b>перезапустить</b> JOSM после внесения любых изменений.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170
@@ -2606,12 +2605,22 @@
 "Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
 msgstr ""
+"<p>Вы можете заметить, что в списке выбора клавиш на следующей вкладке есть "
+"все клавиши со всех типов клавиатур, известных Java, а не только те клавиши, "
+"что есть на Вашей клавиатуре. Пожалуйста, используйте только те значения, "
+"которые соответствуют клавишам, присутствующим на Вашей клавиатуре. Поэтому, "
+"если на ней нет клавиши 'Copy' (она есть только на клавиатурах от Sun), то "
+"не используйте её. Так-же в списке есть клавиши, соответствующие значению в "
+"верхнем регистре (например, ':'/двоеточие). Пожалуйста, не используйте и их. "
+"Используйте основную клавишу(';'/точка с запятой для английской раскладки, "
+"либо '6' для русской). В противном случае могут возникать конфликты, так как "
+"JOSM что в английской раскладке Ctrl+Shift+; и Ctrl+: это одно и то-же...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177
 msgid "<p>Thank you for your understanding</p>"
-msgstr ""
+msgstr "<p>Спасибо за понимание</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
-msgstr ""
+msgstr "<h1>Группы модификаторов</h1>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:179
@@ -2623,4 +2632,9 @@
 "already taken, it will assign a random shortcut instead.</p>"
 msgstr ""
+"<p>На последней вкладке указаны клавиши-модификаторы, которые JOSM "
+"автоматически назначит для горячих клавиш. Для каждой из четырёх групп "
+"горячих клавиш есть по три варианта модификаторов. При разрешении "
+"конфликтов, эти варианты будут проверяться в указанном порядке. Если все "
+"варианты окажутся уже заняты, будет назначено случайное сочетание клавиш.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
@@ -2635,30 +2649,26 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:207
-#, fuzzy
 msgid "Use default"
-msgstr "По умолчанию"
+msgstr "Использовать значение по умолчанию"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:217
-#, fuzzy
 msgid "Disable"
-msgstr "масштаб"
+msgstr "Отключить"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
-#, fuzzy
 msgid "Key:"
-msgstr "Ключ"
+msgstr "Клавиша:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
-msgstr ""
+msgstr "Внимание: Используйте только присутствующие на клавиатуре клавиши!"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:247
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Горячие клавиши"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:254
-#, fuzzy
 msgid "Edit Shortcuts"
-msgstr "Править здание суда"
+msgstr "Горячие клавиши правки"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:257
@@ -2666,7 +2676,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:303
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:326
-#, fuzzy
 msgid "Primary modifier:"
-msgstr "Съезд с основной"
+msgstr "Основной модификатор:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:263
@@ -2674,7 +2683,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:309
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:332
-#, fuzzy
 msgid "Secondary modifier:"
-msgstr "Вторичная"
+msgstr "Вторичный модификатор:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:269
@@ -2682,11 +2690,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:315
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:338
-#, fuzzy
 msgid "Tertiary modifier:"
-msgstr "Третичная"
+msgstr "Третичный модификатор:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:277
 msgid "Menu Shortcuts"
-msgstr ""
+msgstr "Горячие клавиши меню"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:300
@@ -2699,7 +2706,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:360
-#, fuzzy
 msgid "Modifier Groups"
-msgstr "Хвойный"
+msgstr "Группы модификаторов"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:170
@@ -2714,9 +2720,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Java OpenStreetMap Editor"
-msgstr ""
+msgstr "Редактор OpenStreetMap на Java"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "usage"
-msgstr ""
+msgstr "использование"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
@@ -2734,9 +2740,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Download the bounding box"
-msgstr ""
+msgstr "Скачать область в пределах рамки"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
@@ -2746,5 +2752,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Download the bounding box as raw gps"
-msgstr ""
+msgstr "Скачать область в пределах рамки, как данные GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
@@ -2754,5 +2760,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Don't launch in fullscreen mode"
-msgstr ""
+msgstr "Yt запускать в полноэкранном режиме"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
@@ -2782,5 +2788,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
 msgid "Activating updated plugins"
-msgstr ""
+msgstr "Включение обновлённых модулей"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
@@ -2789,8 +2795,10 @@
 "overwrite the existing ones."
 msgstr ""
+"Ошибка при включении обновлённых модулей. Убедитесь, что JOSM имеет "
+"разрешение переписывать существующие модули."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Loading early plugins"
-msgstr ""
+msgstr "Загрузка ранних модулей"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:210
@@ -2824,5 +2832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
 msgid "resolved version:"
-msgstr ""
+msgstr "Разрешённая версия:"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
@@ -2835,7 +2843,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
-#, fuzzy, java-format
+#, java-format
 msgid "An error occured in plugin {0}"
-msgstr "В модуле {0} произошла ошибка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
@@ -2875,5 +2883,5 @@
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
 msgid "RemoveRelationMember"
-msgstr ""
+msgstr "Удалить Члена Отношения"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
@@ -2910,5 +2918,6 @@
 msgid_plural "objects"
 msgstr[0] "объект"
-msgstr[1] "объекты"
+msgstr[1] "объекта"
+msgstr[2] "объектов"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:80
@@ -2955,4 +2964,7 @@
 "use them.<br>Do you really want to delete?"
 msgstr ""
+"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
+"вызвать проблемы, потому что другие объекты (которых не видно) могут "
+"использовать их.<br> Вы действительно хотите удалить их?"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
@@ -3038,7 +3050,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:33
-#, fuzzy
 msgid "Mercator"
-msgstr "Оператор"
+msgstr "Проекция Меркатора"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
@@ -3089,5 +3100,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:110
 msgid "waterway"
-msgstr "водные пути"
+msgstr "водоёмы"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:111
@@ -3133,7 +3144,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Edit: {0}"
-msgstr "Править сушу"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
@@ -3160,7 +3171,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#, fuzzy, java-format
+#, java-format
 msgid "View: {0}"
-msgstr "Показать {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
@@ -3175,5 +3186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
 msgid "Also rename the file"
-msgstr ""
+msgstr "Переименовать файл"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
@@ -3216,7 +3227,7 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
-#, fuzzy, java-format
+#, java-format
 msgid "Tool: {0}"
-msgstr "Показать {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
@@ -3259,5 +3270,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:127
 msgid "Bug Reports"
-msgstr "Отчеты об ошибках"
+msgstr "Отчёты об ошибках"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:129
@@ -3412,5 +3423,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
 msgid "Predefined"
-msgstr ""
+msgstr "Набор"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
@@ -3433,5 +3444,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:192
 msgid "Choose a predefined license"
-msgstr ""
+msgstr "Выберите лицензию из набора"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
@@ -3451,7 +3462,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#, fuzzy, java-format
+#, java-format
 msgid "File: {0}"
-msgstr "Файл"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
@@ -3471,6 +3482,7 @@
 msgid "The selected node is no inner part of any way."
 msgid_plural "The selected nodes are no inner part of any way."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Выбранная точка не является частью какой-либо линии"
+msgstr[1] "Выбранные точки не являются частью какой-либо линии"
+msgstr[2] "Выбранные точки не являются частью какой-либо линии"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
@@ -3488,6 +3500,7 @@
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Выбранная линия не содержит выбранной точки"
+msgstr[1] "Выбранная линия не содержит выбранных точек"
+msgstr[2] "Выбранная линия не содержит выбранных точек"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
@@ -3509,4 +3522,6 @@
 "You should verify this and correct it when necessary."
 msgstr ""
+"Членство в отношениях было применено ко всем новым линиям.\n"
+"Проверьте, и при необходимости внесите корректировки."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
@@ -3599,5 +3614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr ""
+msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
@@ -3673,5 +3688,5 @@
 #, java-format
 msgid "Contact {0}..."
-msgstr ""
+msgstr "Связаться с {0}..."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
@@ -3696,5 +3711,5 @@
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:45
 msgid "Search..."
-msgstr ""
+msgstr "Найти..."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
@@ -3749,10 +3764,10 @@
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:167
@@ -3771,9 +3786,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
-msgstr ""
+msgstr "Отсутствуют параметры для \"ИЛИ\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
-msgstr ""
+msgstr "Отсутствуют параметры для \"НЕ\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
@@ -3817,4 +3832,6 @@
 "a bug."
 msgstr ""
+"Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
+"создайте отчёт об ошибке."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
@@ -3889,7 +3906,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Mode: {0}"
-msgstr "Переместить"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:129
@@ -3898,4 +3915,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
+"Щёлкните для удаления. Shift: удалить сегмент. Ctrl: удалить линию, но "
+"оставить точки."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87
@@ -3934,5 +3953,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
-msgstr ""
+msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:75
@@ -3988,5 +4007,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:624
 msgid "Click to insert a new node and make a connection."
-msgstr ""
+msgstr "Щёлкните, чтобы создать точку или линию"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:628
@@ -4005,5 +4024,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
 msgid "Cannot move objects outside of the world."
-msgstr ""
+msgstr "Невозможно переместить объекты за пределы мира."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:391
@@ -4019,4 +4038,5 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"Объекты можно перетаскивать; Shift - добавить к выделению (Ctrl - вычесть)"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -4034,8 +4054,10 @@
 "move zoom with right button"
 msgstr ""
+"Меняйте масштаб колесом мыши, или клавишами  Ctrl+. и Ctrl+,; перемещайте "
+"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Выход"
@@ -4051,7 +4073,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#, fuzzy
 msgid "Merge nodes into the oldest one."
-msgstr "Объединить точки в одну"
+msgstr "Объединить точки в одну (более старую)"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:72
@@ -4064,12 +4085,16 @@
 "to merge them?"
 msgstr ""
+"Выделенные точки участвуют в различных отношениях. Всё равно хотите "
+"объединить?"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
 msgid "Merge nodes with different memberships?"
-msgstr ""
+msgstr "Объединить точки из разных отношений?"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:234
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
+"Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
+"используется."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:272
@@ -4100,12 +4125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-#, fuzzy
 msgid "Please select closed way(s) of at least four nodes."
-msgstr "Выделите не менее четырёх точек."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
-#, fuzzy
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr "Пожалуйста выберите как минимум две точки для объединения."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
@@ -4123,10 +4146,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Toggle GPX Lines"
-msgstr ""
+msgstr "Показать/Скрыть линии GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, fuzzy, java-format
+#, java-format
 msgid "Toggles the global setting ''{0}''."
-msgstr "Использовать глобальные настройки."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
@@ -4142,62 +4165,53 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
-#, fuzzy
 msgid "Unselect All (Focus)"
-msgstr "Снять выделение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
-#, fuzzy
 msgid "Unselect All (Escape)"
-msgstr "Снять выделение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
-#, fuzzy
 msgid "Create Circle"
-msgstr "Создание областей"
+msgstr "Создать окружность"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#, fuzzy
 msgid "Create a circle from three selected nodes."
-msgstr "Разбить линию надвое в выбранной точке."
+msgstr "Создать окружность по трём выделенным точкам"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-#, fuzzy
 msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Выделите одну замкнутую линию, состоящую ровно из четырёх точек."
+msgstr ""
+"Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх "
+"точек."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-#, fuzzy
 msgid "Those nodes are not in a circle."
-msgstr "Переместить выделенные точки так, чтобы они сформировали окружность."
+msgstr "Точки не расположены по кругу"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49
-#, fuzzy
 msgid "Open Location..."
-msgstr "Открыть"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#, fuzzy
 msgid "Open a URL."
-msgstr "Открыть файл."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:54
-#, fuzzy
 msgid "Separate Layer"
-msgstr "Разделитель"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:61
-#, fuzzy
 msgid "Download Location"
-msgstr "Скачать список"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73
-#, fuzzy
 msgid "Add Node"
-msgstr "Добавить точку"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
@@ -4206,7 +4220,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#, fuzzy
 msgid "Enter the coordinates for the new node."
-msgstr "Пожалуйста, сначала введите желаемые координаты"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
@@ -4232,5 +4245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
 msgid "up"
-msgstr ""
+msgstr "вверх"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
@@ -4238,32 +4251,29 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Move objects {0}"
-msgstr "Члены: {0}"
+msgstr "Переместить объекты {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-#, fuzzy
 msgid "down"
-msgstr "Маленький город"
+msgstr "вниз"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-#, fuzzy
 msgid "left"
-msgstr "Удалить"
+msgstr "влево"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-#, fuzzy
 msgid "right"
-msgstr "Высота"
+msgstr "вправо"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0}"
-msgstr "Переместить"
+msgstr "Переместить {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
-#, fuzzy, java-format
+#, java-format
 msgid "Moves Objects {0}"
-msgstr "Члены: {0}"
+msgstr "Перемещает объекты {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
@@ -4296,11 +4306,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46
-#, fuzzy
 msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Необходимо выбрать точку, входящую как минимум в две линии."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68
 msgid "This node is not glued to anything else."
-msgstr ""
+msgstr "Данная точка не связана с чем-либо еще."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
@@ -4317,12 +4326,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101
-#, fuzzy
 msgid "Select either:"
-msgstr "Выбор"
+msgstr "Выберите один из вариантов:"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
-#, fuzzy
 msgid "* One node that is used by more than one way, or"
-msgstr "Необходимо выбрать точку, входящую как минимум в две линии."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
@@ -4351,10 +4358,10 @@
 #, java-format
 msgid "Dupe into {0} nodes"
-msgstr ""
+msgstr "Дублировать в {0} точек"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Объединить точки в одну"
+msgstr "Дублировать {0} точек в {1} точек"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
@@ -4374,7 +4381,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#, fuzzy, java-format
+#, java-format
 msgid "Audio: {0}"
-msgstr "Параметры Аудио"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
@@ -4408,9 +4415,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:21
 msgid "Forward"
-msgstr "Вперед"
+msgstr "Вперёд"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:20
 msgid "Jump forward"
-msgstr "Перемотать вперед."
+msgstr "Перемотать вперёд"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
@@ -4421,5 +4428,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 msgid "Play/pause audio."
-msgstr ""
+msgstr "Играть/Пауза"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
@@ -4430,5 +4437,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
 msgid "Faster Forward"
-msgstr "Бастрее Вперед"
+msgstr "Играть быстрее."
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -4474,5 +4481,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69
 msgid "Raw GPS data"
-msgstr ""
+msgstr "Необработанные данные GPS"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
@@ -4520,12 +4527,10 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:39
-#, fuzzy
 msgid "Apply selected changes"
-msgstr "Загрузить эти изменения?"
+msgstr "Применить выбранные изменения"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-#, fuzzy
 msgid "Don't apply changes"
-msgstr "Обмен валют"
+msgstr "Не применять изменения"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82
@@ -4534,12 +4539,10 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95
-#, fuzzy
 msgid "Properties of "
-msgstr "Изменить параметры"
+msgstr "Свойства "
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119
-#, fuzzy
 msgid "Roles in relations referring to"
-msgstr "Показать окно со списком выбранных объектов."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
@@ -4560,17 +4563,14 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-#, fuzzy
 msgid "Relation"
-msgstr "Отношения"
+msgstr "Отношение"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-#, fuzzy
 msgid "Old role"
-msgstr "Старое значение"
+msgstr "Старая роль"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-#, fuzzy
 msgid "New role"
-msgstr "Новое значение"
+msgstr "Новая роль"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
@@ -4581,5 +4581,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
 msgid "Duplicate selected ways."
-msgstr ""
+msgstr "Дублировать выбранные линии."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
@@ -4589,5 +4589,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
-msgstr ""
+msgstr "Выберите хотя бы одну линию"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
@@ -4641,7 +4641,6 @@
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
-#, fuzzy
 msgid "Measurements"
-msgstr "Памятник"
+msgstr ""
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:68
@@ -4710,7 +4709,7 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
-#, fuzzy, java-format
+#, java-format
 msgid "Request details: {0}"
-msgstr "текущая разница: {0}с"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
@@ -4883,12 +4882,10 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
-#, fuzzy
 msgid "Downloading image tile..."
-msgstr "Загрузка..."
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
-#, fuzzy
 msgid "Could not acquire image"
-msgstr "Невозможно создать резервную копию."
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:36
@@ -5210,4 +5207,6 @@
 "layer, but are not connected by a node."
 msgstr ""
+"Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) "
+"пересекаются на одном слое, но не имеют общей точки."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
@@ -5290,5 +5289,5 @@
 #, java-format
 msgid "waterway type {0}"
-msgstr ""
+msgstr "тип водоёма: {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
@@ -5598,7 +5597,6 @@
 
 #: ../plugins/livegps/livegps/LiveGpsLayer.java:25
-#, fuzzy
 msgid "LiveGPS layer"
-msgstr "Преобразовать в слой GPX"
+msgstr ""
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41
@@ -5718,7 +5716,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
-#, fuzzy
 msgid "Way: "
-msgstr "Дороги"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -5794,7 +5791,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
-#, fuzzy
 msgid "Position only"
-msgstr "положение"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
@@ -5843,37 +5839,30 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
-#, fuzzy
 msgid "Unknown logFormat"
-msgstr "Неизвестный хост"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
-#, fuzzy
 msgid "Port:"
-msgstr "Спорт"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#, fuzzy
 msgid "Refresh"
-msgstr "Сноска"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
-#, fuzzy
 msgid "refresh the port list"
-msgstr "Обновить список выбранного."
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
-#, fuzzy
 msgid "Configure"
-msgstr "Курс"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
-#, fuzzy
 msgid "Configure Device"
-msgstr "Курс"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
-#, fuzzy
 msgid "Connection Error."
-msgstr "Ошибка подключения."
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
@@ -5886,17 +5875,14 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:47
-#, fuzzy
 msgid "Importing data from device."
-msgstr "На устройстве не найдено данных."
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:53
-#, fuzzy
 msgid "Importing data from DG100..."
-msgstr "Импортированы данные с {0}"
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:67
-#, fuzzy
 msgid "Error deleting data."
-msgstr "Ошибка при парсинге."
+msgstr ""
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:73
@@ -5963,5 +5949,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:89
@@ -5975,5 +5960,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
@@ -6079,9 +6063,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:248
 msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr ""
+msgstr " [дд/мм/гггг чч:мм:сс]"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256
 msgid "I'm in the timezone of: "
-msgstr ""
+msgstr "Я нахожусь в часовом поясе: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:319
@@ -6118,5 +6102,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
 msgid "Open an other GPXtrace"
-msgstr ""
+msgstr "Открыть другой трэк GPX"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
@@ -6131,4 +6115,5 @@
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
+"<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
@@ -6189,15 +6174,13 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:646
 msgid "GPX Track loaded"
-msgstr ""
+msgstr "Трэк GPX загружен"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
-#, fuzzy
 msgid "Upload Traces"
-msgstr "Параметры загрузки"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
-#, fuzzy
 msgid "Uploads traces to openstreetmap.org"
-msgstr "ссылка с www.openstreetmap.org"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:273
@@ -6352,7 +6335,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
-#, fuzzy
 msgid "Menu Name (Default)"
-msgstr "имя пользователя OSM (e-mail)"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
@@ -6365,12 +6347,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
-#, fuzzy
 msgid "Copy Default"
-msgstr "По умолчанию"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
-#, fuzzy
 msgid "Please select the row to copy."
-msgstr "Пожалуйста, выберите ряд для редактирования."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18
@@ -6519,10 +6499,9 @@
 msgstr ""
 
-#: surveyor.java:6
-#, fuzzy
+#: surveyor.java:23
 msgid "Tunnel Start"
-msgstr "Тоннель"
-
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+msgstr ""
+
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6535,73 +6514,67 @@
 msgstr "Мост"
 
-#: surveyor.java:16
-#, fuzzy
+#: surveyor.java:33
 msgid "Village/City"
-msgstr "Деревня"
-
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgstr ""
+
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Стоянка"
 
-#: surveyor.java:29
-#, fuzzy
+#: surveyor.java:46
 msgid "One Way"
-msgstr "Односторонняя"
-
-#: surveyor.java:33
+msgstr ""
+
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
-#, fuzzy
+#: surveyor.java:55
 msgid "Fuel Station"
-msgstr "Пожарное депо"
-
-#: surveyor.java:43 presets.java:1446
+msgstr ""
+
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Гостиница"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Ресторан"
 
-#: surveyor.java:52
-#, fuzzy
+#: surveyor.java:69
 msgid "Shopping"
-msgstr "Стрельба"
-
-#: surveyor.java:56
+msgstr ""
+
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
-#, fuzzy
+#: surveyor.java:77
 msgid "Camping"
-msgstr "Кэмпинг"
-
-#: surveyor.java:72 presets.java:40
+msgstr ""
+
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Автобан"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Основная"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Вторичная"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Не классифицировано"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "Внутренняя"
 
-#: surveyor.java:93 surveyor.java:97
-#, fuzzy
+#: surveyor.java:114 surveyor.java:118
 msgid "Test"
-msgstr "Сброс"
+msgstr ""
 
 #: presets.java:39
@@ -6771,5 +6744,5 @@
 #: presets.java:622 presets.java:1203
 msgid "Surface"
-msgstr "Поверхность"
+msgstr "Дорожное покрытие"
 
 #: presets.java:220 presets.java:238 presets.java:256 presets.java:270
@@ -6779,5 +6752,5 @@
 #: presets.java:622 presets.java:1203
 msgid "paved"
-msgstr "с покрытием"
+msgstr "асфальтированная"
 
 #: presets.java:220 presets.java:238 presets.java:256 presets.java:270
@@ -6785,5 +6758,5 @@
 #: presets.java:448 presets.java:466 presets.java:622 presets.java:1203
 msgid "unpaved"
-msgstr "без покрытия"
+msgstr "неасфальтированная"
 
 #: presets.java:220 presets.java:238 presets.java:256 presets.java:270
@@ -7021,33 +6994,33 @@
 #: presets.java:324
 msgid "motorway"
-msgstr ""
+msgstr "Автобан"
 
 #: presets.java:324
 msgid "motorway_link"
-msgstr ""
+msgstr "Съезд с автомагистрали"
 
 #: presets.java:324
 msgid "trunk"
-msgstr ""
+msgstr "Автострада"
 
 #: presets.java:324
 msgid "trunk_link"
-msgstr ""
+msgstr "Съезд с автострады"
 
 #: presets.java:324
 msgid "primary"
-msgstr ""
+msgstr "Основная"
 
 #: presets.java:324
 msgid "primary_link"
-msgstr ""
+msgstr "Съезд с основной"
 
 #: presets.java:324
 msgid "secondary"
-msgstr ""
+msgstr "Вторичная"
 
 #: presets.java:324
 msgid "tertiary"
-msgstr ""
+msgstr "Третичная"
 
 #: presets.java:324
@@ -7057,13 +7030,13 @@
 #: presets.java:324
 msgid "residential"
-msgstr ""
+msgstr "Внутренняя"
 
 #: presets.java:324
 msgid "living_street"
-msgstr ""
+msgstr "Жилая"
 
 #: presets.java:324
 msgid "service"
-msgstr ""
+msgstr "Служебная"
 
 #: presets.java:324
@@ -7073,5 +7046,5 @@
 #: presets.java:324
 msgid "construction"
-msgstr ""
+msgstr "Строительство"
 
 #: presets.java:340
@@ -7097,5 +7070,5 @@
 #: presets.java:370
 msgid "roundabout"
-msgstr ""
+msgstr "Круг"
 
 #: presets.java:377
@@ -7150,20 +7123,20 @@
 #: presets.java:569 presets.java:590
 msgid "gravel"
-msgstr ""
+msgstr "гравий"
 
 #: presets.java:485 presets.java:506 presets.java:527 presets.java:548
 #: presets.java:569 presets.java:590
 msgid "ground"
-msgstr ""
+msgstr "грунт"
 
 #: presets.java:485 presets.java:506 presets.java:527 presets.java:548
 #: presets.java:569 presets.java:590
 msgid "grass"
-msgstr ""
+msgstr "трава"
 
 #: presets.java:485 presets.java:506 presets.java:527 presets.java:548
 #: presets.java:569 presets.java:590
 msgid "sand"
-msgstr ""
+msgstr "песок"
 
 #: presets.java:493
@@ -7273,5 +7246,5 @@
 #: presets.java:701
 msgid "Waypoints"
-msgstr ""
+msgstr "Путевые точки"
 
 #: presets.java:702
@@ -7351,7 +7324,6 @@
 
 #: presets.java:761
-#, fuzzy
 msgid "Signpost"
-msgstr "Спорт"
+msgstr ""
 
 #: presets.java:765
@@ -7360,7 +7332,6 @@
 
 #: presets.java:769
-#, fuzzy
 msgid "Emergency Phone"
-msgstr "Пункт вызова экстренной помощи"
+msgstr ""
 
 #: presets.java:775
@@ -7382,12 +7353,10 @@
 #: presets.java:793 presets.java:1481 presets.java:2772 presets.java:2779
 #: presets.java:2786
-#, fuzzy
 msgid "Elevation"
-msgstr "Отношения"
+msgstr ""
 
 #: presets.java:799
-#, fuzzy
 msgid "Barriers"
-msgstr "Батарейки"
+msgstr ""
 
 #: presets.java:801
@@ -7396,7 +7365,6 @@
 
 #: presets.java:802
-#, fuzzy
 msgid "Edit a Stile"
-msgstr "Править ручей"
+msgstr ""
 
 #: presets.java:805 presets.java:815 presets.java:825 presets.java:838
@@ -7408,12 +7376,10 @@
 
 #: presets.java:811
-#, fuzzy
 msgid "Kissing Gate"
-msgstr "Питьевая вода"
+msgstr ""
 
 #: presets.java:812
-#, fuzzy
 msgid "Edit a Kissing Gate"
-msgstr "Править жилую улицу"
+msgstr ""
 
 #: presets.java:821
@@ -7422,7 +7388,6 @@
 
 #: presets.java:822
-#, fuzzy
 msgid "Edit a Hampshire Gate"
-msgstr "Править кресельную дорогу"
+msgstr ""
 
 #: presets.java:834
@@ -7431,22 +7396,18 @@
 
 #: presets.java:835
-#, fuzzy
 msgid "Edit a bollard"
-msgstr "Править скейтборд"
+msgstr ""
 
 #: presets.java:846
-#, fuzzy
 msgid "Drawbridge"
-msgstr "Рисовать точки"
+msgstr ""
 
 #: presets.java:847
-#, fuzzy
 msgid "Edit a Drawbridge"
-msgstr "Править мост"
+msgstr ""
 
 #: presets.java:859
-#, fuzzy
 msgid "Bus Trap"
-msgstr "Автобусная остановка"
+msgstr ""
 
 #: presets.java:863
@@ -7455,7 +7416,6 @@
 
 #: presets.java:864
-#, fuzzy
 msgid "Edit a Cattle Grid"
-msgstr "Править канатную дорогу"
+msgstr ""
 
 #: presets.java:875
@@ -7464,7 +7424,6 @@
 
 #: presets.java:876
-#, fuzzy
 msgid "Edit a Spikes"
-msgstr "Править источник"
+msgstr ""
 
 #: presets.java:888
@@ -7473,7 +7432,6 @@
 
 #: presets.java:889
-#, fuzzy
 msgid "Edit a Porticullis"
-msgstr "Править здание суда"
+msgstr ""
 
 #: presets.java:900
@@ -7482,62 +7440,50 @@
 
 #: presets.java:901
-#, fuzzy
 msgid "Edit a Gate"
-msgstr "Править плотину"
+msgstr ""
 
 #: presets.java:913
-#, fuzzy
 msgid "Lift Gate"
-msgstr "Править штат"
+msgstr ""
 
 #: presets.java:914
-#, fuzzy
 msgid "Edit a Lift Gate"
-msgstr "Править лёгкую железную дорогу"
+msgstr ""
 
 #: presets.java:926
-#, fuzzy
 msgid "Sally Port"
-msgstr "точки на железной дороге"
+msgstr ""
 
 #: presets.java:927
-#, fuzzy
 msgid "Edit a Sally Port"
-msgstr "Править съезд"
+msgstr ""
 
 #: presets.java:939
-#, fuzzy
 msgid "Bump Gate"
-msgstr "Ворота"
+msgstr ""
 
 #: presets.java:940
-#, fuzzy
 msgid "Edit a Bump Gate"
-msgstr "Править автовокзал"
+msgstr ""
 
 #: presets.java:952
-#, fuzzy
 msgid "Hedge"
-msgstr "Показать/Скрыть"
+msgstr ""
 
 #: presets.java:956
-#, fuzzy
 msgid "Fence"
-msgstr "Последовательность"
+msgstr ""
 
 #: presets.java:960
-#, fuzzy
 msgid "Block"
-msgstr "Назад"
+msgstr ""
 
 #: presets.java:964
-#, fuzzy
 msgid "Wall"
-msgstr "все"
+msgstr ""
 
 #: presets.java:968
-#, fuzzy
 msgid "City Wall"
-msgstr "Название города"
+msgstr ""
 
 #: presets.java:972
@@ -7558,21 +7504,18 @@
 
 #: presets.java:988
-#, fuzzy
 msgid "Edit a Border Control"
-msgstr "Править мост"
+msgstr ""
 
 #: presets.java:1002
-#, fuzzy
 msgid "Entrance"
-msgstr "Вход в пещеру"
+msgstr ""
 
 #: presets.java:1003
-#, fuzzy
 msgid "Edit a Entrance"
-msgstr "Править вход в пещеру"
+msgstr ""
 
 #: presets.java:1024
 msgid "Waterway"
-msgstr "Водный путь"
+msgstr "Водоёмы"
 
 #: presets.java:1025
@@ -7594,9 +7537,9 @@
 #: presets.java:1041
 msgid "Drain"
-msgstr ""
+msgstr "Водосток"
 
 #: presets.java:1042
 msgid "Edit a Drain"
-msgstr ""
+msgstr "Править водосток"
 
 #: presets.java:1049
@@ -7618,9 +7561,9 @@
 #: presets.java:1071
 msgid "Boatyard"
-msgstr ""
+msgstr "Лодочная мастерская"
 
 #: presets.java:1072
 msgid "Edit a Boatyard"
-msgstr ""
+msgstr "Править лодочную мастерскую"
 
 #: presets.java:1078
@@ -7642,5 +7585,5 @@
 #: presets.java:1095
 msgid "Waterway Point"
-msgstr ""
+msgstr "Гидротехнические сооружения"
 
 #: presets.java:1096
@@ -7650,9 +7593,9 @@
 #: presets.java:1100
 msgid "Weir"
-msgstr ""
+msgstr "Водослив"
 
 #: presets.java:1101
 msgid "Edit a Weir"
-msgstr ""
+msgstr "Править водослив"
 
 #: presets.java:1107
@@ -7681,7 +7624,6 @@
 
 #: presets.java:1125
-#, fuzzy
 msgid "Edit Ferry Terminal"
-msgstr "Править прокат авто"
+msgstr ""
 
 #: presets.java:1130
@@ -7858,17 +7800,14 @@
 
 #: presets.java:1274
-#, fuzzy
 msgid "surface"
-msgstr "Поверхность"
+msgstr ""
 
 #: presets.java:1274
-#, fuzzy
 msgid "multi-storey"
-msgstr "Журнал"
+msgstr ""
 
 #: presets.java:1274
-#, fuzzy
 msgid "underground"
-msgstr "Детский сад"
+msgstr ""
 
 #: presets.java:1274
@@ -7881,12 +7820,10 @@
 
 #: presets.java:1278
-#, fuzzy
 msgid "Wash"
-msgstr "Дороги"
+msgstr ""
 
 #: presets.java:1279
-#, fuzzy
 msgid "Edit Car Wash"
-msgstr "Править мастерскую"
+msgstr ""
 
 #: presets.java:1285 presets.java:1327
@@ -7899,12 +7836,10 @@
 
 #: presets.java:1292
-#, fuzzy
 msgid "Repair"
-msgstr "Железная дорога"
+msgstr ""
 
 #: presets.java:1293
-#, fuzzy
 msgid "Edit Car Repair"
-msgstr "Править прокат авто"
+msgstr ""
 
 #: presets.java:1299 presets.java:1321
@@ -7945,7 +7880,6 @@
 
 #: presets.java:1343
-#, fuzzy
 msgid "UIC-Reference"
-msgstr "Сноска"
+msgstr ""
 
 #: presets.java:1346
@@ -7966,22 +7900,18 @@
 
 #: presets.java:1366
-#, fuzzy
 msgid "Railway Platform"
-msgstr "Железная дорога"
+msgstr ""
 
 #: presets.java:1367
-#, fuzzy
 msgid "Edit a railway platform"
-msgstr "Править основную дорогу"
+msgstr ""
 
 #: presets.java:1370 presets.java:1413
-#, fuzzy
 msgid "Reference (track number)"
-msgstr "Сноска"
+msgstr ""
 
 #: presets.java:1372 presets.java:1415
-#, fuzzy
 msgid "Area"
-msgstr "Создать"
+msgstr ""
 
 #: presets.java:1375
@@ -8014,12 +7944,10 @@
 
 #: presets.java:1409
-#, fuzzy
 msgid "Bus Platform"
-msgstr "Автовокзал"
+msgstr ""
 
 #: presets.java:1410
-#, fuzzy
 msgid "Edit a bus platform"
-msgstr "Править автовокзал"
+msgstr ""
 
 #: presets.java:1420
@@ -8032,12 +7960,10 @@
 
 #: presets.java:1428
-#, fuzzy
 msgid "Airport"
-msgstr "Спорт"
+msgstr "Аэропорт"
 
 #: presets.java:1429
-#, fuzzy
 msgid "Edit an airport"
-msgstr "Править съезд"
+msgstr "Править аэропорт"
 
 #: presets.java:1436
@@ -8058,7 +7984,6 @@
 
 #: presets.java:1450
-#, fuzzy
 msgid "Stars"
-msgstr "Состояние"
+msgstr ""
 
 #: presets.java:1453
@@ -8079,12 +8004,10 @@
 
 #: presets.java:1465
-#, fuzzy
 msgid "Chalet"
-msgstr "Изменить"
+msgstr ""
 
 #: presets.java:1466
-#, fuzzy
 msgid "Edit Chalet"
-msgstr "Править замок"
+msgstr ""
 
 #: presets.java:1471
@@ -8101,7 +8024,6 @@
 
 #: presets.java:1478
-#, fuzzy
 msgid "Edit Alpine Hut"
-msgstr "Править трубопровод"
+msgstr ""
 
 #: presets.java:1484
@@ -8130,12 +8052,10 @@
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "Cuisine"
-msgstr "Побережье"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "italian"
-msgstr "Англиканская"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
@@ -8152,7 +8072,6 @@
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "greek"
-msgstr "Дерево"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
@@ -8161,12 +8080,10 @@
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "indian"
-msgstr "энергия ветра"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "regional"
-msgstr "Область"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
@@ -8179,12 +8096,10 @@
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "asian"
-msgstr "Бассейн"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "thai"
-msgstr "Бахаи"
+msgstr ""
 
 #: presets.java:1504 presets.java:1511
@@ -8193,7 +8108,6 @@
 
 #: presets.java:1504 presets.java:1511
-#, fuzzy
 msgid "japanese"
-msgstr "Полосы"
+msgstr ""
 
 #: presets.java:1507
@@ -8254,17 +8168,14 @@
 
 #: presets.java:1547
-#, fuzzy
 msgid "Edit Information Point"
-msgstr "Информация"
+msgstr ""
 
 #: presets.java:1549
-#, fuzzy
 msgid "office"
-msgstr "Почтовое отделение"
+msgstr ""
 
 #: presets.java:1549
-#, fuzzy
 msgid "map"
-msgstr "Карта"
+msgstr ""
 
 #: presets.java:1549
@@ -8277,22 +8188,18 @@
 
 #: presets.java:1549
-#, fuzzy
 msgid "bicyclemap"
-msgstr "Велосипед"
+msgstr ""
 
 #: presets.java:1549
-#, fuzzy
 msgid "board"
-msgstr "Вперед"
+msgstr ""
 
 #: presets.java:1549
-#, fuzzy
 msgid "history"
-msgstr "Журнал"
+msgstr ""
 
 #: presets.java:1549
-#, fuzzy
 msgid "nature"
-msgstr "Театр"
+msgstr ""
 
 #: presets.java:1549
@@ -8422,17 +8329,17 @@
 #: presets.java:1639
 msgid "Wayside Cross"
-msgstr ""
+msgstr "Придорожный крест"
 
 #: presets.java:1640
 msgid "Edit a Wayside Cross"
-msgstr ""
+msgstr "Править придорожный крест"
 
 #: presets.java:1645
 msgid "Wayside Shrine"
-msgstr ""
+msgstr "Придорожная святыня"
 
 #: presets.java:1646
 msgid "Edit a Wayside Shrine"
-msgstr ""
+msgstr "Править придорожную святыню"
 
 #: presets.java:1652
@@ -9025,12 +8932,10 @@
 
 #: presets.java:2008
-#, fuzzy
 msgid "Town hall"
-msgstr "Здание муниципалитета"
+msgstr ""
 
 #: presets.java:2009
-#, fuzzy
 msgid "Edit Town hall"
-msgstr "Править здание  муниципалитета"
+msgstr ""
 
 #: presets.java:2014
@@ -9039,7 +8944,6 @@
 
 #: presets.java:2015
-#, fuzzy
 msgid "Edit Embassy"
-msgstr "Править бухту"
+msgstr ""
 
 #: presets.java:2020
@@ -9300,7 +9204,6 @@
 
 #: presets.java:2123
-#, fuzzy
 msgid "Country code"
-msgstr "Страна"
+msgstr ""
 
 #: presets.java:2126
@@ -9389,7 +9292,6 @@
 
 #: presets.java:2161
-#, fuzzy
 msgid "coal"
-msgstr "масштаб"
+msgstr ""
 
 #: presets.java:2161
@@ -9498,17 +9400,14 @@
 
 #: presets.java:2238 presets.java:2328
-#, fuzzy
 msgid "Reference number"
-msgstr "Сноска"
+msgstr ""
 
 #: presets.java:2239
-#, fuzzy
 msgid "Charge"
-msgstr "Изменить"
+msgstr ""
 
 #: presets.java:2240 presets.java:2329
-#, fuzzy
 msgid "Note"
-msgstr "Без даты"
+msgstr ""
 
 #: presets.java:2243
@@ -9521,17 +9420,14 @@
 
 #: presets.java:2249
-#, fuzzy
 msgid "Edit a Telephone"
-msgstr "Править дерево"
+msgstr ""
 
 #: presets.java:2252 presets.java:2330
-#, fuzzy
 msgid "Coins"
-msgstr "опции"
+msgstr ""
 
 #: presets.java:2253 presets.java:2331
-#, fuzzy
 msgid "Notes"
-msgstr "Без даты"
+msgstr ""
 
 #: presets.java:2254 presets.java:2332
@@ -9544,12 +9440,10 @@
 
 #: presets.java:2256 presets.java:2334
-#, fuzzy
 msgid "Credit cards"
-msgstr "Создание областей"
+msgstr ""
 
 #: presets.java:2257
-#, fuzzy
 msgid "Telephone cards"
-msgstr "Телефон"
+msgstr ""
 
 #: presets.java:2260
@@ -9566,7 +9460,6 @@
 
 #: presets.java:2264
-#, fuzzy
 msgid "Cans"
-msgstr "Наличные"
+msgstr ""
 
 #: presets.java:2265
@@ -9579,7 +9472,6 @@
 
 #: presets.java:2267
-#, fuzzy
 msgid "Paper"
-msgstr "Парк"
+msgstr ""
 
 #: presets.java:2268
@@ -9596,17 +9488,14 @@
 
 #: presets.java:2276
-#, fuzzy
 msgid "Edit a Hunting Stand"
-msgstr "Править перекрёсток"
+msgstr ""
 
 #: presets.java:2279
-#, fuzzy
 msgid "Hide"
-msgstr "Показать/Скрыть"
+msgstr ""
 
 #: presets.java:2280
-#, fuzzy
 msgid "Lock"
-msgstr "Причал"
+msgstr ""
 
 #: presets.java:2281 presets.java:2758
@@ -9615,7 +9504,6 @@
 
 #: presets.java:2281
-#, fuzzy
 msgid "low"
-msgstr "Медленнее"
+msgstr ""
 
 #: presets.java:2281
@@ -9669,9 +9557,9 @@
 #: presets.java:2311
 msgid "Convenience Store"
-msgstr ""
+msgstr "Продуктовый магазин"
 
 #: presets.java:2312
 msgid "Edit Convenience Store"
-msgstr ""
+msgstr "править продуктовый магазин"
 
 #: presets.java:2317
@@ -9685,25 +9573,21 @@
 #: presets.java:2323
 msgid "Vending machine"
-msgstr ""
+msgstr "Торговый автомат"
 
 #: presets.java:2324
-#, fuzzy
 msgid "Edit a Vending_machine"
-msgstr "Править переработку отходов"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "Vending products"
-msgstr "Часы работы"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "public_transport_tickets"
-msgstr "Общественный транспорт"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "public_transport_plans"
-msgstr "Общественный транспорт"
+msgstr ""
 
 #: presets.java:2326
@@ -9712,27 +9596,22 @@
 
 #: presets.java:2326
-#, fuzzy
 msgid "food"
-msgstr "Грузовик (до 3.5т)"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "drinks"
-msgstr "Питание"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "sweets"
-msgstr "Предустановки"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "cigarettes"
-msgstr "Пивная"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "photos"
-msgstr "Выбрать"
+msgstr ""
 
 #: presets.java:2326
@@ -9745,12 +9624,10 @@
 
 #: presets.java:2326
-#, fuzzy
 msgid "toys"
-msgstr "до"
+msgstr ""
 
 #: presets.java:2326
-#, fuzzy
 msgid "stamps"
-msgstr "стадион"
+msgstr ""
 
 #: presets.java:2326
@@ -9763,7 +9640,6 @@
 
 #: presets.java:2326
-#, fuzzy
 msgid "vouchers"
-msgstr "Мясная лавка"
+msgstr ""
 
 #: presets.java:2326
@@ -9772,7 +9648,6 @@
 
 #: presets.java:2326
-#, fuzzy
 msgid "tampons"
-msgstr "Даосизм"
+msgstr ""
 
 #: presets.java:2326
@@ -9809,12 +9684,10 @@
 
 #: presets.java:2356
-#, fuzzy
 msgid "Hairdresser"
-msgstr "Адреса"
+msgstr ""
 
 #: presets.java:2357
-#, fuzzy
 msgid "Edit Hairdresser"
-msgstr "Править сад"
+msgstr ""
 
 #: presets.java:2362
@@ -9879,22 +9752,18 @@
 
 #: presets.java:2404
-#, fuzzy
 msgid "Doctors"
-msgstr "Цвета"
+msgstr ""
 
 #: presets.java:2405
-#, fuzzy
 msgid "Edit Doctors"
-msgstr "Править цеха"
+msgstr ""
 
 #: presets.java:2410
-#, fuzzy
 msgid "Dentist"
-msgstr "Методизм"
+msgstr ""
 
 #: presets.java:2411
-#, fuzzy
 msgid "Edit Dentist"
-msgstr "Править теннис"
+msgstr ""
 
 #: presets.java:2416
@@ -9939,12 +9808,10 @@
 
 #: presets.java:2439
-#, fuzzy
 msgid "Veterinary"
-msgstr "Третичная"
+msgstr ""
 
 #: presets.java:2440
-#, fuzzy
 msgid "Edit Veterinary"
-msgstr "Править переправу"
+msgstr ""
 
 #: presets.java:2450
@@ -10089,17 +9956,14 @@
 
 #: presets.java:2573
-#, fuzzy
 msgid "Land use"
-msgstr "Землепользование"
+msgstr ""
 
 #: presets.java:2574
-#, fuzzy
 msgid "Graveyard"
-msgstr "Кладбище"
+msgstr "Церковное кладбище"
 
 #: presets.java:2575
-#, fuzzy
 msgid "Edit Graveyard"
-msgstr "Править кладбище"
+msgstr "Править церковное кладбище"
 
 #: presets.java:2582
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 12493)
+++ applications/editors/josm/i18n/po/sl.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-10-28 18:26+0000\n"
 "Last-Translator: Štefan Baebler <Unknown>\n"
@@ -1196,5 +1196,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Podrobnosti"
@@ -3996,5 +3996,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Končaj"
@@ -6460,10 +6460,10 @@
 msgstr ""
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "Predor"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6476,70 +6476,70 @@
 msgstr "Most"
 
-#: surveyor.java:16
+#: surveyor.java:33
 #, fuzzy
 msgid "Village/City"
 msgstr "Vas"
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Parkirišče"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "Enosmerna"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Gasilski dom"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr ""
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr ""
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Strelišče"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Plezanje"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Avtocesta"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Glavna cesta (1.,2. reda)"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Regionalna cesta (1.,2. reda)"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 12493)
+++ applications/editors/josm/i18n/po/sv.po	(revision 12505)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 23:24+0100\n"
+"POT-Creation-Date: 2008-12-23 12:27+0100\n"
 "PO-Revision-Date: 2008-12-22 09:24+0000\n"
 "Last-Translator: Susanna Björverud <Unknown>\n"
@@ -1201,5 +1201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
-#: surveyor.java:64
+#: surveyor.java:81
 msgid "Info"
 msgstr "Information"
@@ -4065,5 +4065,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: surveyor.java:68
+#: surveyor.java:85
 msgid "Exit"
 msgstr "Avsluta"
@@ -6590,10 +6590,10 @@
 msgstr "Navigera"
 
-#: surveyor.java:6
+#: surveyor.java:23
 #, fuzzy
 msgid "Tunnel Start"
 msgstr "Tunnel"
 
-#: surveyor.java:12 presets.java:53 presets.java:70 presets.java:89
+#: surveyor.java:29 presets.java:53 presets.java:70 presets.java:89
 #: presets.java:107 presets.java:128 presets.java:145 presets.java:164
 #: presets.java:182 presets.java:197 presets.java:215 presets.java:233
@@ -6606,69 +6606,69 @@
 msgstr "Bro"
 
-#: surveyor.java:16
+#: surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: surveyor.java:24 presets.java:1270 presets.java:1315
+#: surveyor.java:41 presets.java:1270 presets.java:1315
 msgid "Parking"
 msgstr "Parkeringsplats"
 
-#: surveyor.java:29
+#: surveyor.java:46
 #, fuzzy
 msgid "One Way"
 msgstr "Enkelriktat"
 
-#: surveyor.java:33
+#: surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: surveyor.java:38
+#: surveyor.java:55
 #, fuzzy
 msgid "Fuel Station"
 msgstr "Brandstation"
 
-#: surveyor.java:43 presets.java:1446
+#: surveyor.java:60 presets.java:1446
 msgid "Hotel"
 msgstr "Hotell"
 
-#: surveyor.java:47 presets.java:1500
+#: surveyor.java:64 presets.java:1500
 msgid "Restaurant"
 msgstr "Restaurang"
 
-#: surveyor.java:52
+#: surveyor.java:69
 #, fuzzy
 msgid "Shopping"
 msgstr "Skytte"
 
-#: surveyor.java:56
+#: surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: surveyor.java:60
+#: surveyor.java:77
 #, fuzzy
 msgid "Camping"
 msgstr "Campingplats"
 
-#: surveyor.java:72 presets.java:40
+#: surveyor.java:89 presets.java:40
 msgid "Motorway"
 msgstr "Motorväg"
 
-#: surveyor.java:76 presets.java:115
+#: surveyor.java:93 presets.java:115
 msgid "Primary"
 msgstr "Primär"
 
-#: surveyor.java:80 presets.java:151
+#: surveyor.java:97 presets.java:151
 msgid "Secondary"
 msgstr "Sekundär"
 
-#: surveyor.java:84 presets.java:188
+#: surveyor.java:105 presets.java:188
 msgid "Unclassified"
 msgstr "Oklassificerad"
 
-#: surveyor.java:88 presets.java:206
+#: surveyor.java:109 presets.java:206
 msgid "Residential"
 msgstr "Bostadsområde"
 
-#: surveyor.java:93 surveyor.java:97
+#: surveyor.java:114 surveyor.java:118
 #, fuzzy
 msgid "Test"
