Index: applications/editors/josm/i18n/build.xml
===================================================================
--- applications/editors/josm/i18n/build.xml	(revision 12479)
+++ applications/editors/josm/i18n/build.xml	(revision 12484)
@@ -4,7 +4,8 @@
   <property name="josm.build.dir"    value="../core"/>
   <property name="josm.presets"      value="../core/presets/presets.xml"/>
-  <property name="plugin.dir"        value="../plugins"/>  
-  <property name="validator.tagfile" value="${plugin.dir}/validator/tagchecker.cfg"/>  
-  <property name="wms.srcfile"       value="${plugin.dir}/wmsplugin/sources.cfg"/>  
+  <property name="plugin.dir"        value="../plugins"/>
+  <property name="validator.tagfile" value="${plugin.dir}/validator/tagchecker.cfg"/>
+  <property name="wms.srcfile"       value="${plugin.dir}/wmsplugin/sources.cfg"/>
+  <property name="surveyor.srcfile"  value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
   <property name="i18n.build.dir"    value="build"/>
   <property name="i18n.install.dir"  value="${josm.build.dir}/lib"/>
@@ -23,4 +24,7 @@
     <exec executable="perl" output="wms.java">
       <arg line="convwms.pl ${wms.srcfile}"/>
+    </exec>
+    <exec executable="perl" output="surveyor.java">
+      <arg line="convsurveyor.pl ${surveyor.srcfile}"/>
     </exec>
 
Index: applications/editors/josm/i18n/convsurveyor.pl
===================================================================
--- applications/editors/josm/i18n/convsurveyor.pl	(revision 12484)
+++ applications/editors/josm/i18n/convsurveyor.pl	(revision 12484)
@@ -0,0 +1,33 @@
+#! /usr/bin/perl -w
+
+# Written by Dirk Stöcker <openstreetmap@dstoecker.de>
+# Public domain, no rights reserved.
+
+use strict;
+
+my $item;
+my $comment = 0;
+
+# This is a simple conversion and in no way a complete XML parser
+# but it works with a default Perl installation
+
+while(my $line = <>)
+{
+  chomp($line);
+  if($line =~ /^#(.*)$/)
+  {
+    print "//$1\n";
+  }
+  elsif($line =~ /^$/)
+  {
+    print "\n";
+  }
+  elsif($line =~ /<button label=\"(.*?)\"/)
+  {
+    print "tr(\"$1\") // $_\n";
+  }
+  else
+  {
+    print "/* $line */\n";
+  }
+}
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 12479)
+++ applications/editors/josm/i18n/po/cs.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:49+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-12-15 00:39+0000\n"
 "Last-Translator: Martin Petricek <singularita@gmail.com>\n"
@@ -19,5 +19,5 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -30,5 +30,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -38,5 +38,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -47,5 +47,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)"
@@ -409,5 +409,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -614,7 +614,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<různé>"
@@ -667,5 +667,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -710,4 +710,9 @@
 msgstr "Drátový model"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Drátový model"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -730,5 +735,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -743,5 +748,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -753,5 +758,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -762,9 +767,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -774,26 +779,26 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Zvolte objekty, u kterých chcete změnit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -810,23 +815,23 @@
 msgstr "Přesunout {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -835,5 +840,5 @@
 msgstr "Zvolte řádek k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -843,28 +848,28 @@
 msgstr "Zvolte řádek k vymazání"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Vlastnosti "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Upravit vězení"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Změnit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -883,5 +888,5 @@
 msgstr "Smazat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
@@ -1190,4 +1195,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Informace"
@@ -3165,6 +3171,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3648,5 +3656,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr "Nebyla načtena žádná data."
@@ -3717,13 +3725,13 @@
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr "Chybějící argument pro \"NEBO\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr "Chybějící argument pro \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "Očekávám uzavírací závorku."
@@ -3744,5 +3752,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
@@ -3868,19 +3876,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusť myší tlačítko k zastavení otaáčení"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -3987,4 +3995,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Konec"
@@ -4781,40 +4790,40 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Duplicitní uzly."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5623,22 +5632,23 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5654,4 +5664,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5661,4 +5672,9 @@
 msgstr ""
 
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5671,19 +5687,24 @@
 msgstr "Chyba při exportu {0}: {1}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr "SurveyorPlugin závisí na LiveGpsPlugin!"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr "LiveGpsPlugin nenalezen, nainstalujte jej a zapněte."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr "SurveyorPlugin je momentálně vypnutý"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
 msgstr "SurveyorPlugin"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+#, fuzzy
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "SurveyorPlugin závisí na LiveGpsPlugin!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6448,11 +6469,92 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Tunel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Most"
+
+#: surveyor.java:16
+msgid "Village/City"
+msgstr ""
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Parkoviště"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Jednosměrka"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Hasičská stanice"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Hotel"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Restaurace"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Střelba"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Změnit"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Dálnice"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Silnice 1. třídy"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Silnice 2. třídy"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Místní silnice"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr ""
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Tenis"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Ulice"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Dálnice"
 
 #: presets.java:41
@@ -6515,15 +6617,4 @@
 msgstr "Jednosměrka"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Most"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6580,8 +6671,4 @@
 msgstr ""
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Silnice 1. třídy"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6596,8 +6683,4 @@
 msgstr "Upravit spojku silnice 1. třídy"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Silnice 2. třídy"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6611,8 +6694,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Upravit silnici 3. třídy"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Místní silnice"
 
 #: presets.java:189
@@ -6630,8 +6709,4 @@
 msgid "Width (metres)"
 msgstr "Šířka (metrů)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr ""
 
 #: presets.java:207
@@ -7726,8 +7801,4 @@
 msgstr ""
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Parkoviště"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -7919,8 +7990,4 @@
 msgstr "Ubytování"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Hotel"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -7994,8 +8061,4 @@
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Restaurace"
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 12479)
+++ applications/editors/josm/i18n/po/de.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:23+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-12-22 14:29+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
@@ -18,5 +18,5 @@
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -30,5 +30,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -38,5 +38,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -47,5 +47,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)"
@@ -68,5 +68,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 "
@@ -79,5 +80,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 "
@@ -374,5 +376,6 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:460
 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:462
@@ -428,5 +431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -515,5 +518,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 "
@@ -587,5 +591,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
@@ -638,7 +643,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<verschieden>"
@@ -690,5 +695,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -733,4 +738,9 @@
 msgstr "Drahtdarstellung"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Drahtdarstellung"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -750,8 +760,9 @@
 #: ../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
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -765,5 +776,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -775,5 +786,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -784,9 +795,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -795,26 +806,27 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+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
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -831,23 +843,23 @@
 msgstr "Umschalten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Mitglied von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} löschen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -856,5 +868,5 @@
 msgstr "Bitte wählen sie eine Zeile zum Bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -864,25 +876,25 @@
 msgstr "Bitte wählen Sie die zu löschende Zeile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 msgid "Edit Properties"
 msgstr "Eigenschaften korrigieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 msgid "Delete Properties"
 msgstr "Einstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -901,5 +913,5 @@
 msgstr "Löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Den Schlüssel aus allen Objekten löschen"
@@ -968,5 +980,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
@@ -982,5 +995,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
@@ -1149,5 +1163,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 "
@@ -1213,4 +1228,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Info"
@@ -1240,5 +1256,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
@@ -1302,5 +1319,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 "
@@ -1989,5 +2007,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 "
@@ -2265,5 +2284,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
@@ -2283,5 +2303,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
@@ -2325,5 +2346,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
@@ -2361,5 +2383,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
@@ -2456,6 +2479,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
@@ -2464,5 +2489,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-"
@@ -2582,5 +2608,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
@@ -2677,5 +2704,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
@@ -2911,5 +2939,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 "
@@ -3259,6 +3288,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #, java-format
 msgid "Tool: {0}"
@@ -3752,5 +3783,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr "Keine Daten geladen"
@@ -3836,13 +3867,13 @@
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr "Fehlendes Argument für 'OR'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr "Fehlendes Argument für 'NICHT'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "Erwarte schließende Klammer."
@@ -3863,5 +3894,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
@@ -3969,6 +4000,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"Anklicken: löschen Umschalt: Lösche Wegabschnitt. Alt: unbenutze Knotenpunkte "
-"nicht löschen. Strg: Lösche verweisende Objekte."
+"Anklicken: löschen Umschalt: Lösche Wegabschnitt. Alt: unbenutze "
+"Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87
@@ -3993,19 +4024,20 @@
 msgstr "Weg ausweiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen um Objekte im Rechteck auszuwählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../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."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+msgstr ""
+"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Um das Drehen zu stoppen, Maustaste loslassen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen."
@@ -4051,5 +4083,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
@@ -4059,5 +4092,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
@@ -4085,5 +4119,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 "
@@ -4117,4 +4152,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Beenden"
@@ -4183,9 +4219,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
@@ -4244,5 +4282,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
@@ -4398,5 +4437,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 "
@@ -4404,5 +4444,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 "
@@ -4734,5 +4775,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 "
@@ -4741,5 +4783,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
@@ -4814,5 +4857,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
@@ -4916,39 +4960,39 @@
 msgstr "Bis jetzt {0} Knoten..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
 msgstr "Lake Walker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lake Walker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr "Fehler beim Erstellen des Speichers: {0}"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr "Abzeichnen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr "prüfe Speicher..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr "Knotenpunktreduktion durchführen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr "Douglas-Peucker-Näherung durchführen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
 msgstr "Doppelte Knoten entfernen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5017,5 +5061,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
@@ -5045,5 +5090,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 "
@@ -5078,9 +5124,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
@@ -5233,5 +5281,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
@@ -5280,5 +5329,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."
 
@@ -5479,5 +5529,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 "
@@ -5505,5 +5556,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
@@ -5594,5 +5646,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
@@ -5774,22 +5827,23 @@
 msgstr "Richtung"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr "Vermessung ..."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr "Vermessungswerkzeug öffnen."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr "Vermessung"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Konnte Vermessungsdefinition nicht lesen: {0}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5805,4 +5859,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr "Live-Daten automatisch speichern"
@@ -5812,4 +5867,10 @@
 msgstr "Speichere die aufgezeichneten Daten jede Minute."
 
+#: ../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 "Wege"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5822,19 +5883,24 @@
 msgstr "Fehler beim exportieren von {0}: {1}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin!"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr "LiveGPS-Plugin nicht gefunden, bitte installieren und aktivieren."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr "Das Surveyor-Plugin ist im Moment deaktiviert"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
 msgstr "Surveyor-(Vermessungs-)Plugin"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+#, fuzzy
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6038,6 +6104,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 "
@@ -6357,5 +6425,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
@@ -6483,5 +6552,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 "
@@ -6618,5 +6688,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
@@ -6633,11 +6704,94 @@
 msgstr "Navigieren"
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Tunnel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Brücke"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "Dorf"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Parken"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Einbahn"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Feuerwache"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Hotel"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Restaurant"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Schießen"
+
+#: surveyor.java:56
+#, fuzzy
+msgid "WC"
+msgstr "W"
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Campingplatz"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Autobahn"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Bundesstraße"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Landesstraße"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Ohne Klassifikation"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "Ortsstraße"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Zurücksetzen"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Straßen"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Autobahn"
 
 #: presets.java:41
@@ -6700,15 +6854,4 @@
 msgstr "Einbahn"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Brücke"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6765,8 +6908,4 @@
 msgstr "Schnellstraßenanschluß bearbeiten"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Bundesstraße"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6781,8 +6920,4 @@
 msgstr "Bundesstraßenanschluß bearbeiten"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Landesstraße"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6796,8 +6931,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Kreisstraße bearbeiten"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Ohne Klassifikation"
 
 #: presets.java:189
@@ -6815,8 +6946,4 @@
 msgid "Width (metres)"
 msgstr "Breite (Meter)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr "Ortsstraße"
 
 #: presets.java:207
@@ -7881,8 +8008,4 @@
 msgstr "Tankstelle bearbeiten"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Parken"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8069,8 +8192,4 @@
 msgstr "Unterkunft"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Hotel"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8140,8 +8259,4 @@
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Restaurant"
 
 #: presets.java:1501
@@ -10530,3 +10645,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 12479)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:52+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 14/10/2006 18:36+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -25,5 +25,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -31,5 +31,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -38,5 +38,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 #, fuzzy
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
@@ -416,5 +416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -636,7 +636,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<different>"
@@ -690,5 +690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -733,4 +733,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+msgid "Toggle Wireframe view"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -753,5 +757,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, fuzzy, java-format
 msgid "This will change up to {0} object."
@@ -765,5 +769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -775,5 +779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -784,9 +788,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change properties of up to {0} object"
@@ -795,28 +799,28 @@
 msgstr[1] "Change {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Please select objects for which you want to change properties."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #, fuzzy
 msgid "Properties/Memberships"
 msgstr "Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 #, fuzzy
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -833,9 +837,9 @@
 msgstr "Auto Scale: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 #, fuzzy
@@ -843,15 +847,15 @@
 msgstr "Resolve"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 #, fuzzy
 msgid "Change relation"
 msgstr "Change Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -860,5 +864,5 @@
 msgstr "Please select the row to edit."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -868,28 +872,28 @@
 msgstr "Please select the row to delete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Change Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -908,5 +912,5 @@
 msgstr "Delete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
@@ -1237,4 +1241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Info"
@@ -3263,6 +3268,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #, java-format
 msgid "Tool: {0}"
@@ -3764,5 +3771,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 #, fuzzy
 msgid "No data loaded."
@@ -3834,13 +3841,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr ""
@@ -3864,5 +3871,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Align Nodes in Circle"
@@ -3995,19 +4002,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -4118,4 +4125,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Exit"
@@ -4955,41 +4963,41 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 #, fuzzy
 msgid "Tracing"
 msgstr "string"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Add segment"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5835,22 +5843,23 @@
 msgstr "Choose"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Could not read from url: \"{0}\""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, fuzzy, java-format
 msgid "Error parsing {0}: {1}"
@@ -5866,4 +5875,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5873,4 +5883,10 @@
 msgid "Save captured data to file every minute."
 msgstr "Save the current data to a new file."
+
+#: ../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 "way"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -5884,18 +5900,22 @@
 msgstr "Error while exporting {0}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
 
@@ -6701,12 +6721,96 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "unnamed"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr ""
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "image"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+#, fuzzy
+msgid "Parking"
+msgstr "string"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "new"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Selection"
+
+#: surveyor.java:43 presets.java:1446
+#, fuzzy
+msgid "Hotel"
+msgstr "Help"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr ""
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Do nothing"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Connection"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr ""
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr ""
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr ""
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr ""
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr ""
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Revert"
+
 #: presets.java:39
 #, fuzzy
 msgid "Streets"
 msgstr "Select"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr ""
 
 #: presets.java:41
@@ -6772,15 +6876,4 @@
 msgstr "new"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr ""
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6839,8 +6932,4 @@
 msgstr ""
 
-#: presets.java:115
-msgid "Primary"
-msgstr ""
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6855,8 +6944,4 @@
 msgstr ""
 
-#: presets.java:151
-msgid "Secondary"
-msgstr ""
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6869,8 +6954,4 @@
 #: presets.java:171
 msgid "Edit a Tertiary Road"
-msgstr ""
-
-#: presets.java:188
-msgid "Unclassified"
 msgstr ""
 
@@ -6888,8 +6969,4 @@
 #: presets.java:1414
 msgid "Width (metres)"
-msgstr ""
-
-#: presets.java:206
-msgid "Residential"
 msgstr ""
 
@@ -8018,9 +8095,4 @@
 msgstr "Edit"
 
-#: presets.java:1270 presets.java:1315
-#, fuzzy
-msgid "Parking"
-msgstr "string"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8220,9 +8292,4 @@
 msgstr "Add author information"
 
-#: presets.java:1446
-#, fuzzy
-msgid "Hotel"
-msgstr "Help"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8297,8 +8364,4 @@
 #: presets.java:1499
 msgid "Food+Drinks"
-msgstr ""
-
-#: presets.java:1500
-msgid "Restaurant"
 msgstr ""
 
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 12479)
+++ applications/editors/josm/i18n/po/fr.po	(revision 12484)
@@ -6,5 +6,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:23+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-11-19 22:37+0100\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -15,5 +15,5 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -26,5 +26,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -34,5 +34,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -43,5 +43,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 #, fuzzy
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
@@ -444,5 +444,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -674,7 +674,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<différent>"
@@ -728,5 +728,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -771,4 +771,9 @@
 msgstr "Vue avec couleurs et icônes"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Vue avec couleurs et icônes"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -791,5 +796,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, fuzzy, java-format
 msgid "This will change up to {0} object."
@@ -803,5 +808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -813,5 +818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -822,9 +827,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change properties of up to {0} object"
@@ -833,28 +838,28 @@
 msgstr[1] "Changer les propriétés pour {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Sélectionnez les objets dont vous voulez changer les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Sélectionner une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #, fuzzy
 msgid "Properties/Memberships"
 msgstr "Propriétés/Membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 #, fuzzy
 msgid "Properties for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -871,9 +876,9 @@
 msgstr "Zoom auto : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 #, fuzzy
@@ -881,15 +886,15 @@
 msgstr "Rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 #, fuzzy
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -898,5 +903,5 @@
 msgstr "Sélectionnez l'étage à éditer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -906,28 +911,28 @@
 msgstr "Sélectionner l'étage à supprimer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Propriétés de "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Corriger les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Changer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -946,5 +951,5 @@
 msgstr "Supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
@@ -1285,4 +1290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Info"
@@ -3425,6 +3431,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #, java-format
 msgid "Tool: {0}"
@@ -3943,5 +3951,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 #, fuzzy
 msgid "No data loaded."
@@ -4028,13 +4036,13 @@
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr "Arguments manquants pour le OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr "Arguments manquants pour le -"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "Les parenthèses doivent être fermées."
@@ -4058,5 +4066,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Placer les noeuds en cercle"
@@ -4197,5 +4205,5 @@
 msgstr "Extruder un chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
@@ -4203,5 +4211,5 @@
 "Relacher le bouton de souris pour sélectionner les objets dans le rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -4209,10 +4217,10 @@
 "souris."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr "Déplacer un segment du chemin pour faire un rectangle."
@@ -4331,4 +4339,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Quitter"
@@ -5203,41 +5212,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
 msgstr "Lake Walker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lake Walker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, fuzzy, java-format
 msgid "Error creating cache directory: {0}"
 msgstr "Erreur à la lecture du fichier d'information du greffon : {0}"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 #, fuzzy
 msgid "Tracing"
 msgstr "Traçage"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Noeuds dupliqués."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -6131,22 +6140,23 @@
 msgstr "Route"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr "Surveyor ..."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr "Ouvrir l'outil d'arpentage"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr "Surveyor"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Impossible de lire la définition d'arpentage : {0}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, fuzzy, java-format
 msgid "Error parsing {0}: {1}"
@@ -6162,4 +6172,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr "Sauvegarde automatique des données en direct"
@@ -6169,4 +6180,10 @@
 msgid "Save captured data to file every minute."
 msgstr "Sauvegarder les données capturées dans un fichier chaque minute."
+
+#: ../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 "Chemins"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -6180,19 +6197,24 @@
 msgstr "Erreur à l'export {0} : {1}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr "SurveyorPlugin dépend de LiveGpsPlugin !"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../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."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr "SurveyorPlugin est désactivé pour le moment"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
 msgstr "SurveyorPlugin"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+#, fuzzy
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "SurveyorPlugin dépend de LiveGpsPlugin !"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -7056,12 +7078,96 @@
 msgstr "Naviguer"
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Tunnel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Pont"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "Village"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+#, fuzzy
+msgid "Parking"
+msgstr "Parking"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Sens unique"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Caserne de pompiers"
+
+#: surveyor.java:43 presets.java:1446
+#, fuzzy
+msgid "Hotel"
+msgstr "Hôtel"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Restaurant"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Tir sportif"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Camping"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Autoroute"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Route primaire"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Route secondaire"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Route mineure"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "Rue résidentielle"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Remettre à zéro"
+
 #: presets.java:39
 #, fuzzy
 msgid "Streets"
 msgstr "Rues"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Autoroute"
 
 #: presets.java:41
@@ -7127,15 +7233,4 @@
 msgstr "Sens unique"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Pont"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -7194,8 +7289,4 @@
 msgstr "Éditer une bretelle d'accès à une voie rapide"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Route primaire"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -7210,8 +7301,4 @@
 msgstr "Éditer une bretelle d'accès à une route primaire"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Route secondaire"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -7225,8 +7312,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Éditer une route tertiaire"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Route mineure"
 
 #: presets.java:189
@@ -7245,8 +7328,4 @@
 msgstr "Largeur (en mètres)"
 
-#: presets.java:206
-msgid "Residential"
-msgstr "Rue résidentielle"
-
 #: presets.java:207
 msgid "Edit a Residential Street"
@@ -8386,9 +8465,4 @@
 msgstr "Éditer une station service"
 
-#: presets.java:1270 presets.java:1315
-#, fuzzy
-msgid "Parking"
-msgstr "Parking"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8589,9 +8663,4 @@
 msgstr "Hébergement"
 
-#: presets.java:1446
-#, fuzzy
-msgid "Hotel"
-msgstr "Hôtel"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8668,8 +8737,4 @@
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Restaurant"
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 12479)
+++ applications/editors/josm/i18n/po/it.po	(revision 12484)
@@ -5,5 +5,5 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:45+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-12-20 09:32+0000\n"
 "Last-Translator: vincivis <Unknown>\n"
@@ -16,5 +16,5 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -24,5 +24,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -32,5 +32,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -41,5 +41,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
@@ -427,5 +427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -643,7 +643,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<diverso>"
@@ -695,5 +695,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -738,4 +738,9 @@
 msgstr "Visualizzazione a fil di ferro"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Visualizzazione a fil di ferro"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -758,5 +763,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -770,5 +775,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -780,5 +785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -789,9 +794,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -800,26 +805,26 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Seleziona gli oggetti dei quali vuoi cambiare le proprietà."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -836,23 +841,23 @@
 msgstr "Muovi {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -861,5 +866,5 @@
 msgstr "Scegli la riga da modificare."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -869,28 +874,28 @@
 msgstr "Scegli la riga da cancellare."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Proprietà di "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Correggi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Modifica Proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -909,5 +914,5 @@
 msgstr "Cancella"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
@@ -1226,4 +1231,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Informazioni"
@@ -3296,6 +3302,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3788,5 +3796,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr "Nessun dato caricato."
@@ -3873,13 +3881,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr "Argomenti mancanti per l'operatore booleano OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr "Argomento mancante per l'operatore booleano NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "Era attesa una parentesi chiusa."
@@ -3900,5 +3908,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Disponi i nodi in cerchio"
@@ -4029,5 +4037,5 @@
 msgstr "Estrudi il percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
@@ -4036,5 +4044,5 @@
 "rettangolo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -4042,10 +4050,10 @@
 "del mouse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -4159,4 +4167,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Esci"
@@ -4982,40 +4991,40 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
 msgstr "Lake Walker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lago Walker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr "Tracciato"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Nodi duplicati."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5864,22 +5873,23 @@
 msgstr "Rotta"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr "Surveyor ..."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr "Apri lo strumento Surveyor."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr "Ispettore"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Impossibile leggere la definizione di surveyor: {0}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5895,4 +5905,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr "Salvataggio automatico LiveData"
@@ -5902,4 +5913,10 @@
 msgstr "Salva ogni minuto su file i dati acquisiti."
 
+#: ../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 "Ways"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5912,19 +5929,24 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr "L'estensione Surveyor dipende dall'estensione LiveGps."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr "Estensione LiveGps non trovata, installarla e attivarla."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr "L'estensione Surveyor è momentaneamente disabilitata"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
 msgstr "EstensioneSurveyor"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+#, fuzzy
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "L'estensione Surveyor dipende dall'estensione LiveGps."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6743,11 +6765,93 @@
 msgstr "Naviga"
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Galleria/tunnel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Bridge"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "Villaggio"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Parking"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Senso unico"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Caserma dei Vigili del Fuoco"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Hotel"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Ristorante"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Poligono di tiro"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Campeggio"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Motorway"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Primary"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Secondary"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Strada non classificata"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "Residential"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Azzera"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Strade"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Motorway"
 
 #: presets.java:41
@@ -6810,15 +6914,4 @@
 msgstr "Senso unico"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Bridge"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6875,8 +6968,4 @@
 msgstr "Modifica Trunk Link"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Primary"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6891,8 +6980,4 @@
 msgstr "Modifica Primary Link"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Secondary"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6906,8 +6991,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Modifica Tertiary"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Strada non classificata"
 
 #: presets.java:189
@@ -6925,8 +7006,4 @@
 msgid "Width (metres)"
 msgstr "Larghezza (metri)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr "Residential"
 
 #: presets.java:207
@@ -8023,8 +8100,4 @@
 msgstr "Modifica una stazione di rifornimento"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Parking"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8218,8 +8291,4 @@
 msgstr "Alloggiamento"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Hotel"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8294,8 +8363,4 @@
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Ristorante"
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 12479)
+++ applications/editors/josm/i18n/po/pl.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:23+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-11-04 22:17+0100\n"
 "Last-Translator: Marcin Floryan <mfloryan@mm.waw.pl>\n"
@@ -23,5 +23,5 @@
 "X-Poedit-Country: POLAND\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -31,5 +31,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -37,5 +37,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -44,5 +44,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)"
@@ -421,5 +421,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -628,7 +628,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<różne>"
@@ -681,5 +681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -724,4 +724,9 @@
 msgstr "Widok szkieletowy"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Widok szkieletowy"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -745,5 +750,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -758,5 +763,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -768,5 +773,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -777,9 +782,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -789,28 +794,28 @@
 msgstr[2] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Proszę zaznaczyć klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Proszę zaznaczyć wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #, fuzzy
 msgid "Properties/Memberships"
 msgstr "Właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 #, fuzzy
 msgid "Properties for selected objects."
 msgstr "Przenieś zaznaczone obiekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -827,23 +832,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Rola"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -852,5 +857,5 @@
 msgstr "Proszę wybrać wiersz do edycji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -860,28 +865,28 @@
 msgstr "Proszę wybrać wiersz do usunięcia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Edycja rurociągu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -900,5 +905,5 @@
 msgstr "Usuń"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr ""
@@ -1214,4 +1219,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Info"
@@ -3196,6 +3202,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3677,5 +3685,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr ""
@@ -3746,13 +3754,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr "Brak argumentów dla operator lub."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr ""
@@ -3773,5 +3781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Wyrównaj węzły na kole"
@@ -3897,19 +3905,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -4018,4 +4026,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Zakończ"
@@ -4812,39 +4821,39 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5648,22 +5657,23 @@
 msgstr "Kurs"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Nie można odczytać \"{0}\""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5679,4 +5689,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5686,4 +5697,10 @@
 msgstr ""
 
+#: ../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 "Drogi"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5696,18 +5713,22 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
 
@@ -6480,11 +6501,93 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "tunel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "most"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "wieś"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "parking"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "jednokierunkowa"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "straż pożarna"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Hotel"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "restauracja"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "strzelectwo"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "pole namiotowe"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "autostrada"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "droga krajowa"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "droga wojewódzka"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "droga gminna"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "droga lokalna"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "tenis"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Sieć drogowa"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "autostrada"
 
 #: presets.java:41
@@ -6547,15 +6650,4 @@
 msgstr "jednokierunkowa"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "most"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6612,8 +6704,4 @@
 msgstr "Edycja dojazdu do drogi ekspresowej"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "droga krajowa"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6628,8 +6716,4 @@
 msgstr "Edycja dojazdu do drogi krajowej"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "droga wojewódzka"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6643,8 +6727,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Edycja drogi powiatowej"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "droga gminna"
 
 #: presets.java:189
@@ -6662,8 +6742,4 @@
 msgid "Width (metres)"
 msgstr "Szerokość (metry)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr "droga lokalna"
 
 #: presets.java:207
@@ -7758,8 +7834,4 @@
 msgstr "Edycja stacji benzynowej"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "parking"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -7958,8 +8030,4 @@
 msgstr "Zakwaterowanie"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Hotel"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8034,8 +8102,4 @@
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "restauracja"
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 12479)
+++ applications/editors/josm/i18n/po/ro.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:52+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2006-10-14 10:09+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -21,5 +21,5 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -29,5 +29,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -35,5 +35,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -42,5 +42,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 #, fuzzy
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
@@ -422,5 +422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -643,7 +643,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<diferit>"
@@ -698,5 +698,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -741,4 +741,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+msgid "Toggle Wireframe view"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -762,5 +766,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, fuzzy, java-format
 msgid "This will change up to {0} object."
@@ -775,5 +779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -785,5 +789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -794,9 +798,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change properties of up to {0} object"
@@ -806,29 +810,29 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr ""
 "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #, fuzzy
 msgid "Properties/Memberships"
 msgstr "Proprietăţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 #, fuzzy
 msgid "Properties for selected objects."
 msgstr "Proprietăţi ale obiectelor selectate."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -845,9 +849,9 @@
 msgstr "Scalare automată: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 #, fuzzy
@@ -855,15 +859,15 @@
 msgstr "Rezolvă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 #, fuzzy
 msgid "Change relation"
 msgstr "Modificare proprietăţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -872,5 +876,5 @@
 msgstr "Vă rog selectaţi rândul care va fi editat."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -880,28 +884,28 @@
 msgstr "Vă rog selectaţi rândul care va fi şters."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Proprietăţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Proprietăţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Modificare proprietăţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -920,5 +924,5 @@
 msgstr "Şterge"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
@@ -1250,4 +1254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Informaţii"
@@ -3301,6 +3306,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #, java-format
 msgid "Tool: {0}"
@@ -3804,5 +3811,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 #, fuzzy
 msgid "No data loaded."
@@ -3874,13 +3881,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr ""
@@ -3904,5 +3911,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Aliniază noduri în cerc"
@@ -4035,19 +4042,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -4158,4 +4165,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Ieşire"
@@ -4996,41 +5004,41 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 #, fuzzy
 msgid "Tracing"
 msgstr "şir"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Adaugă segment"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5876,22 +5884,23 @@
 msgstr "Alegeţi"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, fuzzy, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr "Nu am putut citi de la adresa: \"{0}\""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, fuzzy, java-format
 msgid "Error parsing {0}: {1}"
@@ -5907,4 +5916,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5914,4 +5924,10 @@
 msgid "Save captured data to file every minute."
 msgstr "Salvează datele curente într-un fişier nou."
+
+#: ../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 "cale"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -5925,18 +5941,22 @@
 msgstr "Eroare la exportarea {0}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
 
@@ -6744,12 +6764,96 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "fără nume"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr ""
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "imagine"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+#, fuzzy
+msgid "Parking"
+msgstr "şir"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "nou"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Selecţie"
+
+#: surveyor.java:43 presets.java:1446
+#, fuzzy
+msgid "Hotel"
+msgstr "Ajutor"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr ""
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Nu fă nimic"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Conexiune"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr ""
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr ""
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr ""
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr ""
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr ""
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Anulează"
+
 #: presets.java:39
 #, fuzzy
 msgid "Streets"
 msgstr "Selectaţi"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr ""
 
 #: presets.java:41
@@ -6815,15 +6919,4 @@
 msgstr "nou"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr ""
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6882,8 +6975,4 @@
 msgstr ""
 
-#: presets.java:115
-msgid "Primary"
-msgstr ""
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6898,8 +6987,4 @@
 msgstr ""
 
-#: presets.java:151
-msgid "Secondary"
-msgstr ""
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6912,8 +6997,4 @@
 #: presets.java:171
 msgid "Edit a Tertiary Road"
-msgstr ""
-
-#: presets.java:188
-msgid "Unclassified"
 msgstr ""
 
@@ -6931,8 +7012,4 @@
 #: presets.java:1414
 msgid "Width (metres)"
-msgstr ""
-
-#: presets.java:206
-msgid "Residential"
 msgstr ""
 
@@ -8061,9 +8138,4 @@
 msgstr "Editare"
 
-#: presets.java:1270 presets.java:1315
-#, fuzzy
-msgid "Parking"
-msgstr "şir"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8263,9 +8335,4 @@
 msgstr "Adaugă informaţii despre autor"
 
-#: presets.java:1446
-#, fuzzy
-msgid "Hotel"
-msgstr "Ajutor"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8340,8 +8407,4 @@
 #: presets.java:1499
 msgid "Food+Drinks"
-msgstr ""
-
-#: presets.java:1500
-msgid "Restaurant"
 msgstr ""
 
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 12479)
+++ applications/editors/josm/i18n/po/ru.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:52+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-10-17 20:46+0000\n"
 "Last-Translator: JekaDer <yourname@mail.ru>\n"
@@ -20,5 +20,5 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -28,5 +28,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -34,5 +34,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -41,5 +41,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -421,5 +421,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -628,7 +628,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<различные>"
@@ -681,5 +681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -724,4 +724,9 @@
 msgstr "Каркас"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Каркас"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -744,5 +749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -757,5 +762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -767,5 +772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -776,9 +781,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -787,26 +792,26 @@
 msgstr[1] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Пожалуйста, выберите объекты, параметры которых необходимо изменить."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr "Параметры/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -823,23 +828,23 @@
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Член группы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Удалить выделение из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -848,5 +853,5 @@
 msgstr "Пожалуйста, выберите ряд для редактирования."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -856,28 +861,28 @@
 msgstr "Пожалуйста, выберите ряд для удаления."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Изменить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Править трубопровод"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Изменить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -896,5 +901,5 @@
 msgstr "Удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выбранный ключ из всех объектов"
@@ -1202,4 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Сведения"
@@ -3212,6 +3218,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3698,5 +3706,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr "Никаких данных не загружено"
@@ -3767,13 +3775,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "Отсутствует закрывающая скобка"
@@ -3794,5 +3802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Выстроить точки окружностью"
@@ -3916,19 +3924,19 @@
 msgstr "Выдавливание линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr ""
@@ -4035,4 +4043,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Выход"
@@ -4840,39 +4849,39 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr "Трассировка"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5673,22 +5682,23 @@
 msgstr "Курс"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5704,4 +5714,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5711,4 +5722,10 @@
 msgstr ""
 
+#: ../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 "Дороги"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5721,18 +5738,22 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
 
@@ -6504,11 +6525,93 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Тоннель"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Мост"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "Деревня"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Стоянка"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Односторонняя"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Пожарное депо"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Гостиница"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Ресторан"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Стрельба"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Кэмпинг"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Автобан"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Основная"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Вторичная"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Не классифицировано"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "Внутренняя"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Сброс"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Улицы"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Автобан"
 
 #: presets.java:41
@@ -6571,15 +6674,4 @@
 msgstr "Односторонняя"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Мост"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6636,8 +6728,4 @@
 msgstr "Править съезд с автострады"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Основная"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6652,8 +6740,4 @@
 msgstr "Править съезд с основной"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Вторичная"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6667,8 +6751,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Править третичную"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Не классифицировано"
 
 #: presets.java:189
@@ -6686,8 +6766,4 @@
 msgid "Width (metres)"
 msgstr "Ширина (м)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr "Внутренняя"
 
 #: presets.java:207
@@ -7783,8 +7859,4 @@
 msgstr "Править заправку"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Стоянка"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -7987,8 +8059,4 @@
 msgstr "Проживание"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Гостиница"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8062,8 +8130,4 @@
 msgid "Food+Drinks"
 msgstr "Питание"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Ресторан"
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 12479)
+++ applications/editors/josm/i18n/po/sl.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:23+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-10-28 18:26+0000\n"
 "Last-Translator: Štefan Baebler <Unknown>\n"
@@ -20,5 +20,5 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -28,5 +28,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -34,5 +34,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -41,5 +41,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Namig: Bližnjice lahko urejate v nastavitvah.)"
@@ -412,5 +412,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -619,7 +619,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<različno>"
@@ -673,5 +673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -716,4 +716,9 @@
 msgstr "Mrežni pogled"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+#, fuzzy
+msgid "Toggle Wireframe view"
+msgstr "Mrežni pogled"
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -736,5 +741,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -750,5 +755,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -760,5 +765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -769,9 +774,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -782,26 +787,26 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Izberite predmete, katerim želite spremeniti lastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -818,23 +823,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -843,5 +848,5 @@
 msgstr "Prosim izberite vrstico za urejanje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -851,28 +856,28 @@
 msgstr "Prosim izberite vrstico za izbris."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Lastnosti "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Popravi lastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Spremeni lastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -891,5 +896,5 @@
 msgstr "Izbriši"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
@@ -1197,4 +1202,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Podrobnosti"
@@ -3181,6 +3187,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3657,5 +3665,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr ""
@@ -3726,13 +3734,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr ""
@@ -3753,5 +3761,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Razporedi vozliša v krog"
@@ -3875,19 +3883,19 @@
 msgstr "Izrini pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr "Povlecite segment poti za ustvarjenje pravokotnika."
@@ -3994,4 +4002,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Končaj"
@@ -4782,40 +4791,40 @@
 msgstr ""
 
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Podvojena vozlišča."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5618,22 +5627,23 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5649,4 +5659,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5656,4 +5667,10 @@
 msgstr "Vsako minuto shrani zajete podatke v datoteko."
 
+#: ../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 "Poti"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5666,19 +5683,24 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr "Vstavek Surveyor je odvisen od vstavka LiveGPS!"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
 msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+#, fuzzy
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "Vstavek Surveyor je odvisen od vstavka LiveGPS!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6444,11 +6466,93 @@
 msgstr ""
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Predor"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Most"
+
+#: surveyor.java:16
+#, fuzzy
+msgid "Village/City"
+msgstr "Vas"
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Parkirišče"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Enosmerna"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Gasilski dom"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr ""
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr ""
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Strelišče"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Plezanje"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Avtocesta"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Glavna cesta (1.,2. reda)"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Regionalna cesta (1.,2. reda)"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr ""
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr ""
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Tenis"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Ceste"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Avtocesta"
 
 #: presets.java:41
@@ -6511,15 +6615,4 @@
 msgstr "Enosmerna"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Most"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6576,8 +6669,4 @@
 msgstr "Uredi priključek hitre ceste"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Glavna cesta (1.,2. reda)"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6592,8 +6681,4 @@
 msgstr "Uredi priključek glavne ceste"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Regionalna cesta (1.,2. reda)"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6607,8 +6692,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Uredi regionalno cesto (3. reda, turistična)"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr ""
 
 #: presets.java:189
@@ -6626,8 +6707,4 @@
 msgid "Width (metres)"
 msgstr "Širina (metrov)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr ""
 
 #: presets.java:207
@@ -7720,8 +7797,4 @@
 msgstr "Uredi gorivo"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Parkirišče"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -7914,8 +7987,4 @@
 msgstr "Nastanitev"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr ""
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -7989,8 +8058,4 @@
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr ""
 
 #: presets.java:1501
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 12479)
+++ applications/editors/josm/i18n/po/sv.po	(revision 12484)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 14:45+0100\n"
+"POT-Creation-Date: 2008-12-22 18:35+0100\n"
 "PO-Revision-Date: 2008-12-22 09:24+0000\n"
 "Last-Translator: Susanna Björverud <Unknown>\n"
@@ -19,5 +19,5 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:437
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
 #, java-format
 msgid ""
@@ -27,5 +27,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:442
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid ""
 "This action will have no shortcut.\n"
@@ -33,5 +33,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:444
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -40,5 +40,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:446
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -418,5 +418,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
@@ -624,7 +624,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:520
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 msgid "<different>"
 msgstr "<olika>"
@@ -676,5 +676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -719,4 +719,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+msgid "Toggle Wireframe view"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
@@ -739,5 +743,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 #, java-format
 msgid "This will change up to {0} object."
@@ -751,5 +755,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -761,5 +765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
@@ -770,9 +774,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -781,26 +785,26 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:296
 msgid "Please select objects for which you want to change properties."
 msgstr "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:301
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:432
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
@@ -817,23 +821,23 @@
 msgstr "Flytta {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
 msgid "Role"
 msgstr "Roll"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:155
@@ -842,5 +846,5 @@
 msgstr "Välj vilken rad du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
@@ -850,28 +854,28 @@
 msgstr "Välj vilken rad du vill ta bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 #, fuzzy
 msgid "Add Properties"
 msgstr "Egenskaper för "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
 #, fuzzy
 msgid "Edit Properties"
 msgstr "Rätta till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
 #, fuzzy
 msgid "Delete Properties"
 msgstr "Ändra egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
@@ -890,5 +894,5 @@
 msgstr "Ta bort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
@@ -1203,4 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:132
+#: surveyor.java:64
 msgid "Info"
 msgstr "Information"
@@ -3057,7 +3062,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
 msgid "EPSG:4326"
-msgstr ""
-"Copy text   \t\r\n"
-"EPSG:4326"
+msgstr "EPSG:4326"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:33
@@ -3232,6 +3235,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../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
 msgid "Tool: {0}"
@@ -3720,5 +3725,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
 msgid "No data loaded."
 msgstr "Ingen data har lästs in."
@@ -3789,13 +3794,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:229
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:240
 msgid "Expected closing parenthesis."
 msgstr "En avslutande parentes förväntades"
@@ -3816,5 +3821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
 msgid "Align Nodes in Circle"
 msgstr "Bilda en cirkel av noderna"
@@ -3945,19 +3950,19 @@
 msgstr "Dra ut sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:257
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:389
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:259
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:393
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Drag a way segment to make a rectangle."
 msgstr "Dra en delsträcka för bilda en rektangel."
@@ -4066,4 +4071,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: surveyor.java:68
 msgid "Exit"
 msgstr "Avsluta"
@@ -4876,40 +4882,40 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
 msgstr "Lakewalker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:135
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:168
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
 msgstr "Spårar"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:170
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:206
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:216
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:226
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 #, fuzzy
 msgid "Removing duplicate nodes..."
 msgstr "Dubbletter av noder."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:302
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:129
 msgid "Lakewalker trace"
@@ -5514,7 +5520,5 @@
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr ""
-"Copy text   \t\r\n"
-"Nyckeln ''{0}'' är ogiltig."
+msgstr "Nyckeln ''{0}'' är ogiltig."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:316
@@ -5743,22 +5747,23 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -5774,4 +5779,5 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
 msgstr ""
@@ -5781,4 +5787,10 @@
 msgstr ""
 
+#: ../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 "Stigar och småvägar"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
@@ -5791,18 +5803,22 @@
 msgstr "Fel vid export {0}: {1}"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
 
@@ -6580,11 +6596,92 @@
 msgstr "Navigera"
 
+#: surveyor.java:6
+#, fuzzy
+msgid "Tunnel Start"
+msgstr "Tunnel"
+
+#: surveyor.java:12 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
+#: presets.java:251 presets.java:284 presets.java:330 presets.java:339
+#: presets.java:364 presets.java:386 presets.java:405 presets.java:424
+#: presets.java:443 presets.java:461 presets.java:481 presets.java:502
+#: presets.java:523 presets.java:544 presets.java:565 presets.java:586
+#: presets.java:617 presets.java:1198
+msgid "Bridge"
+msgstr "Bro"
+
+#: surveyor.java:16
+msgid "Village/City"
+msgstr ""
+
+#: surveyor.java:24 presets.java:1270 presets.java:1315
+msgid "Parking"
+msgstr "Parkeringsplats"
+
+#: surveyor.java:29
+#, fuzzy
+msgid "One Way"
+msgstr "Enkelriktat"
+
+#: surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#: surveyor.java:38
+#, fuzzy
+msgid "Fuel Station"
+msgstr "Brandstation"
+
+#: surveyor.java:43 presets.java:1446
+msgid "Hotel"
+msgstr "Hotell"
+
+#: surveyor.java:47 presets.java:1500
+msgid "Restaurant"
+msgstr "Restaurang"
+
+#: surveyor.java:52
+#, fuzzy
+msgid "Shopping"
+msgstr "Skytte"
+
+#: surveyor.java:56
+msgid "WC"
+msgstr ""
+
+#: surveyor.java:60
+#, fuzzy
+msgid "Camping"
+msgstr "Campingplats"
+
+#: surveyor.java:72 presets.java:40
+msgid "Motorway"
+msgstr "Motorväg"
+
+#: surveyor.java:76 presets.java:115
+msgid "Primary"
+msgstr "Primär"
+
+#: surveyor.java:80 presets.java:151
+msgid "Secondary"
+msgstr "Sekundär"
+
+#: surveyor.java:84 presets.java:188
+msgid "Unclassified"
+msgstr "Oklassificerad"
+
+#: surveyor.java:88 presets.java:206
+msgid "Residential"
+msgstr "Bostadsområde"
+
+#: surveyor.java:93 surveyor.java:97
+#, fuzzy
+msgid "Test"
+msgstr "Tennis"
+
 #: presets.java:39
 msgid "Streets"
 msgstr "Vägar"
-
-#: presets.java:40
-msgid "Motorway"
-msgstr "Motorväg"
 
 #: presets.java:41
@@ -6647,15 +6744,4 @@
 msgstr "Enkelriktat"
 
-#: 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 presets.java:251
-#: presets.java:284 presets.java:330 presets.java:339 presets.java:364
-#: presets.java:386 presets.java:405 presets.java:424 presets.java:443
-#: presets.java:461 presets.java:481 presets.java:502 presets.java:523
-#: presets.java:544 presets.java:565 presets.java:586 presets.java:617
-#: presets.java:1198
-msgid "Bridge"
-msgstr "Bro"
-
 #: presets.java:54 presets.java:71 presets.java:90 presets.java:108
 #: presets.java:129 presets.java:146 presets.java:165 presets.java:183
@@ -6712,8 +6798,4 @@
 msgstr "Redigera en stamvägslänk"
 
-#: presets.java:115
-msgid "Primary"
-msgstr "Primär"
-
 #: presets.java:116
 msgid "Edit a Primary Road"
@@ -6728,8 +6810,4 @@
 msgstr "Redigera en primärvägslänk"
 
-#: presets.java:151
-msgid "Secondary"
-msgstr "Sekundär"
-
 #: presets.java:152
 msgid "Edit a Secondary Road"
@@ -6743,8 +6821,4 @@
 msgid "Edit a Tertiary Road"
 msgstr "Redigera en tertiär väg"
-
-#: presets.java:188
-msgid "Unclassified"
-msgstr "Oklassificerad"
 
 #: presets.java:189
@@ -6762,8 +6836,4 @@
 msgid "Width (metres)"
 msgstr "Bredd (meter)"
-
-#: presets.java:206
-msgid "Residential"
-msgstr "Bostadsområde"
 
 #: presets.java:207
@@ -7859,8 +7929,4 @@
 msgstr "Redigera bränsle"
 
-#: presets.java:1270 presets.java:1315
-msgid "Parking"
-msgstr "Parkeringsplats"
-
 #: presets.java:1271
 msgid "Edit Parking"
@@ -8054,8 +8120,4 @@
 msgstr "Logi"
 
-#: presets.java:1446
-msgid "Hotel"
-msgstr "Hotell"
-
 #: presets.java:1447
 msgid "Edit Hotel"
@@ -8130,8 +8192,4 @@
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
-
-#: presets.java:1500
-msgid "Restaurant"
-msgstr "Restaurang"
 
 #: presets.java:1501