Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 12692)
+++ applications/editors/josm/i18n/po/cs.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-29 03:32+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 00:37+0000\n"
 "Last-Translator: Martin Petricek <singularita@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -131,7 +131,8 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
-msgstr ""
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
+msgstr ""
+"Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
@@ -164,11 +165,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, pravděpodobně chybí některé tagy."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Připravuji data..."
@@ -191,36 +191,40 @@
 msgstr "Stahuji body {0} až {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Nalezen element <nd> mimo cestu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "Nalezen <member> tag mimo relaci."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Chybí povinný atribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr ""
 
@@ -234,5 +238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr ""
 
@@ -376,10 +380,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
@@ -545,5 +549,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -551,5 +555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -558,5 +562,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 
@@ -759,5 +763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -769,5 +773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -814,5 +818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -832,5 +836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Role"
@@ -881,5 +885,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -901,18 +905,18 @@
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Upravit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Upravit relaci #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -922,46 +926,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
+msgstr "Přidat všechny zvolené objekty mezi členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
+msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Přidat vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Přidat všechny zvolené objekty mezi členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Smazat vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -972,32 +976,32 @@
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Členové: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Vznikly konflikty během importu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Chyba parsování odezvy serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1011,5 +1015,5 @@
 msgstr "Chyba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Nemohu se připojit na server."
@@ -1037,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1129,14 +1133,14 @@
 msgstr "Spojit vrstvy pod označenou"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Současný výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1145,29 +1149,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Hledat objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Přiblížit na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Výběr: %d cest a %d uzlů"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "Kombinovat {0} cesty"
+msgstr[1] "Kombinovat {0} cesty"
+msgstr[2] "Kombinovat {0} cesty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} uzel)"
+msgstr[1] " ({0} uzly)"
+msgstr[2] " ({0} uzly)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relace"
+msgstr[1] "relace"
+msgstr[2] "relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Popis: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1204,5 +1233,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Informace"
@@ -1311,5 +1340,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1355,5 +1384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1361,10 +1390,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "Není možné vztvořit novou zvukovou značku"
 
@@ -2014,5 +2043,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -2028,5 +2057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -3080,9 +3109,9 @@
 msgstr "Nemohu nahrát předvolby ze serveru."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "nepopsaný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "text"
@@ -3489,11 +3518,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Zvolený uzel není žádnou vnitřní částí zádné cesty"
 msgstr[1] "Zvolené uzly nejsou žádnou vnitřní částí zádné cesty"
 msgstr[2] "Zvolené uzly nejsou žádnou vnitřní částí zádné cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3502,9 +3532,9 @@
 "Existuje více cest využívajících tento uzel(y). Vyberte také jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené uzly nesdílejí stejnou cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3513,10 +3543,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3524,5 +3554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3530,5 +3560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3663,5 +3693,5 @@
 msgstr "Nemůžu číst \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3669,6 +3699,6 @@
 msgstr "Neznámá koncovka souboru: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3677,29 +3707,29 @@
 msgstr "Značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Importované souřadnice: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Nulové souřadnice: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "NMEA import úspěšný"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "NMEA import selhal!"
@@ -3729,11 +3759,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr "Nemohu číst z url:\"{0}\""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Nemohu číst z URL:\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr "Chyba parsování v url:\"{0}\""
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Chyba parsování v URL:\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
@@ -4079,5 +4109,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4087,5 +4117,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Konec"
@@ -4132,5 +4162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
 
@@ -4149,5 +4179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Vyberte uzavřenou cestu (cesty) skládající se z alespoň čtyřech uzlů."
 
@@ -4220,6 +4250,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
-msgstr ""
+msgid "Open an URL."
+msgstr "Otevřít soubor."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:54
@@ -4336,9 +4366,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Žádný z těchto uzlů není přilepen k něčemu jinému."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Žádný z uzlů v této cestě není přilepen k něčemu jinému."
 
@@ -4586,6 +4618,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 
@@ -4616,6 +4648,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
-msgstr ""
+msgid "Can't duplicate unordered way."
+msgstr "Vytvořit duplikát cesty"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -4901,4 +4933,8 @@
 msgid "Permitted actions"
 msgstr "Povolené akce"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, pravděpodobně chybí některé tagy."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5732,5 +5768,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6132,5 +6168,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
@@ -6149,6 +6185,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6169,5 +6205,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6310,5 +6345,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr ""
 
@@ -6394,5 +6429,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6438,10 +6473,10 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr ""
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
-msgstr ""
+msgid "Invalid URL"
+msgstr "Neplatné datum"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
@@ -6504,5 +6539,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
 
@@ -6578,5 +6613,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6656,7 +6691,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6696,5 +6731,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6745,5 +6780,6 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+#, fuzzy
+msgid "Streets NRW Geofabrik.de"
 msgstr "Strassen NRW Geofabrik.de"
 
@@ -6805,9 +6841,9 @@
 msgstr "zkrácené jméno ulice"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr ""
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6822,65 +6858,65 @@
 msgstr "Most"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parkoviště"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr ""
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr ""
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hotel"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Restaurace"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr ""
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr ""
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Dálnice"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Silnice 1. třídy"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Silnice 2. třídy"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Místní silnice"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Ulice"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr ""
@@ -7838,10 +7874,10 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr ""
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
-msgstr ""
+msgid "Edit a Portcullis"
+msgstr "Upravit zkratky"
 
 #: trans_presets.java:905
@@ -8510,5 +8546,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr ""
 
@@ -10853,4 +10889,7 @@
 msgstr "Upravit útes"
 
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Výběr: %d cest a %d uzlů"
+
 #~ msgid "Java OpenStreetMap Editor Version {0}"
 #~ msgstr "Java OpenStreetMap Editor Verze: {0}"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 12692)
+++ applications/editors/josm/i18n/po/de.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 14:12+0100\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 13:41+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -63,5 +63,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
 #, 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, die durch das Plugin \"{0}\" "
@@ -74,5 +75,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
-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 "
@@ -141,6 +143,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Versuchen Sie zuerst eine Aktualisierung auf die neuesten Versionen von JOSM "
@@ -176,11 +178,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, vielleicht fehlende Merkmale."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Daten werden vorbereitet...."
@@ -203,36 +204,41 @@
 msgstr "Punkte {0} bis {1} werden heruntergeladen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Unbekannte Version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+"Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Falsch formatierte Knoten-ID"
 
@@ -246,6 +252,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
-msgstr "Angabe eines kurzes Kommentars über die hochzuladenden Änderungen:"
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
@@ -371,5 +377,6 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
+msgstr ""
+"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:389
@@ -381,5 +388,6 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:466
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Hochladen zum Server enstanden."
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Hochladen zum Server enstanden."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:468
@@ -394,10 +402,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
@@ -522,5 +530,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 "
@@ -566,5 +575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -574,5 +583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -583,5 +592,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Alle zu der initialen Auswahl hinzufügen. Kann eine Google-ähnliche "
@@ -594,5 +603,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
@@ -768,5 +778,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:133
 msgid "Please select the objects you want to change properties for."
-msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte, deren Eigenschaften geändert werden sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
@@ -784,5 +795,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -794,5 +805,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -815,5 +826,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
 msgid "Please select objects for which you want to change properties."
-msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte, deren Eigenschaften geändert werden sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:302
@@ -838,5 +850,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -856,5 +868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Rolle"
@@ -905,5 +917,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -925,18 +937,18 @@
 msgstr "Den Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Neue Relation bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Relation bearbeiten #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -950,46 +962,46 @@
 "Auswahlmöglichkeiten entsprechend einschränkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Belegt durch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Merkmale (leerer Wert löscht das Merkmal)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Ausgewählte Mitglieder nach oben schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Ausgewählte Mitglieder nach unten schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Ausgewähltes hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Alle ausgewählten Objekte als Mitglieder hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Ausgewähltes entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Alle ausgewählten Objekte aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Mitglied in der gewählten Tabellenzeile aus dieser Relation entfernen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -1000,32 +1012,32 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Mitglied der gewählten Tabellenzeile als Auswahl in JOSM übernehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Mitglieder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Konflikte beim Importieren aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Fehler beim Parsen der Serverantwort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1039,5 +1051,5 @@
 msgstr "Fehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Kann nicht mit Server verbinden."
@@ -1065,5 +1077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1160,46 +1172,69 @@
 msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Ein Fenster mit der aktuellen Auswahl öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../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 ""
 "Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten "
 "Objekte setzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Auf ausgewählte Elemente zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Die Auswahlliste aktualisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Suche"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Nach Objekten suchen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Auf Auswahl zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Auswahl: %d Weg(e) und %d Knoten"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} Weg"
+msgstr[1] "{0} Wege"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " {0} Knoten"
+msgstr[1] " {0} Knoten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} Relation"
+msgstr[1] "{0} Relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, java-format
+msgid "Selection: {0}"
+msgstr "Auswahl: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1236,5 +1271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1326,5 +1361,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 "
@@ -1343,5 +1379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr "Audio-Marke an der aktuellen Abspielposition einfügen"
 
@@ -1391,5 +1427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1399,5 +1435,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1406,5 +1442,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "Konnte Audio-Marke nicht synchronisieren."
 
@@ -1670,5 +1706,6 @@
 "Some waypoints with timestamps from before the start of the track were "
 "omitted."
-msgstr "Einige Wegpunkte mit Zeitstempeln vor Beginn der GPS-Spur wurden ignoriert."
+msgstr ""
+"Einige Wegpunkte mit Zeitstempeln vor Beginn der GPS-Spur wurden ignoriert."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053
@@ -2033,5 +2070,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, wenn kein Passwort gespeichert werden "
@@ -2054,5 +2092,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
@@ -2071,5 +2109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -2322,5 +2360,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
@@ -2340,5 +2379,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
@@ -2382,5 +2422,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
@@ -2508,5 +2549,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+msgid ""
+"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 "Maximallänge zum Linienzeichnen (in Meter). Verwenden Sie \"-1\", um alle "
@@ -2518,5 +2560,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68
-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-"
@@ -2537,5 +2580,6 @@
 "Don't draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
+msgstr ""
+"Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
@@ -2654,5 +2698,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 verwendet)."
+msgstr ""
+"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
@@ -2749,5 +2794,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
@@ -2974,5 +3020,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 "
@@ -3180,9 +3227,9 @@
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "Ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "Text"
@@ -3591,10 +3638,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges."
 msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3604,9 +3651,9 @@
 "Bitte auch den Weg auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Die gewählten Punkte gehören nicht zum selben Weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3614,6 +3661,6 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -3621,5 +3668,5 @@
 "trennen zu können."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3629,5 +3676,5 @@
 "in der Mitte des Weges.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3638,5 +3685,5 @@
 "Sie sollten dies überprüfen und falls nötig korrigieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3771,5 +3818,5 @@
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3777,6 +3824,6 @@
 msgstr "Dateiendung unbekannt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3785,29 +3832,29 @@
 msgstr "Wegpunkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Importierte Koordinaten: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr "Ungültige Datensätze: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Prüfsummenfehler: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Unbekannte Datensätze: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Leere Koordinaten: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "NMEA-Einlesen erfolgreich"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "NMEA-Einlesen fehlgeschlagen!"
@@ -3837,10 +3884,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr "Konnte nicht von URL \"{0}\" lesen"
+msgid "Could not read from URL: \"{0}\""
+msgstr "Konnte nicht von der URL \"{0}\" lesen"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr "URL \"{0}\" kann nicht interpretiert werden."
 
@@ -4104,5 +4151,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+msgstr ""
+"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254
@@ -4155,5 +4203,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
@@ -4163,5 +4212,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
@@ -4189,5 +4239,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 ""
 "Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten "
@@ -4213,13 +4264,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
-"Zoomen mit ziehen oder Ctrl+. oder Ctrl+,; Verschieben mit Ctrl+hoch,links,"
-"runter,rechts; Zoom verschieben mit rechter Maus"
+"Zoomen mit ziehen oder Ctrl+. oder Ctrl+,; Verschieben mit Ctrl+hoch, links, "
+"runter, rechts; Zoom verschieben mit rechter Maus"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Beenden"
@@ -4270,5 +4321,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind"
 
@@ -4287,10 +4338,12 @@
 
 #: ../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."
+msgid "Please select one ore more closed ways of at least four nodes."
+msgstr ""
+"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten 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
@@ -4349,5 +4402,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
@@ -4361,5 +4415,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Eine URL öffnen."
 
@@ -4477,9 +4531,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+msgid "None of these nodes are glued to anything else."
 msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
 
@@ -4503,5 +4557,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 "
@@ -4509,5 +4564,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 verwendet "
@@ -4729,6 +4785,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende "
@@ -4761,5 +4817,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr "Kann einen ungeordneten Weg nicht duplizieren."
 
@@ -4844,5 +4900,6 @@
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
-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 ""
 "Testwerkzeug für Objektvorlagen öffnen, um eine Vorschau auf die Dialoge der "
@@ -4851,5 +4908,6 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
+msgstr ""
+"Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44
@@ -5056,4 +5114,8 @@
 msgid "Permitted actions"
 msgstr "Erlaubte Aktionen"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, vielleicht fehlende Merkmale."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5240,5 +5302,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
@@ -5268,5 +5331,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 "
@@ -5305,5 +5369,6 @@
 #: ../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
@@ -5534,5 +5599,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
@@ -5581,6 +5647,8 @@
 
 #: ../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."
-msgstr "Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
+msgid ""
+"This test checks for ways that contain some of their nodes more than once."
+msgstr ""
+"Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
@@ -5615,5 +5683,5 @@
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "\"{0}\" mit \"{1}\" für ersetzen für"
+msgstr "\"{0}\" mit \"{1}\" ersetzen für"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
@@ -5780,5 +5848,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 "
@@ -5889,5 +5958,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 msgid "Validate that property keys are valid checking against list of words."
-msgstr "Schlüssel auf Gültigkeit prüfen durch Abgleich mit einer Liste."
+msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:410
@@ -5907,5 +5976,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -5935,5 +6004,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Check for FIXMES."
-msgstr "Auf Korrekturnotizen prüfen"
+msgstr "Auf Korrekturnotizen prüfen."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:515
@@ -6115,5 +6184,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 msgid "Save captured data to file every minute."
-msgstr "Aufgezeichnete Daten jede Minute in die Datei speichern."
+msgstr "Aufgezeichnete Daten jede Minute speichern."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
@@ -6150,5 +6219,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
+msgstr ""
+"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
@@ -6314,5 +6384,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Daten vom Globalsat-Datenlogger DG100 in eine GPS-Ebene importieren."
 
@@ -6331,10 +6401,11 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
 "Die ausgewählten Wege haben Knoten außerhalb des heruntergeladenen "
-"Datenbereichs. Das kann zu unabsichtlich gelöschten Knoten führen.\n"
+"Datenbereichs.\n"
+"Das kann zu unabsichtlich gelöschten Knoten führen.\n"
 "Sind Sie sich sicher, dass Sie fortfahren wollen?"
 
@@ -6350,5 +6421,6 @@
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
-msgid_plural "The selection contains {0} ways. 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 er vereinfacht werden "
@@ -6502,5 +6574,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
@@ -6592,5 +6664,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen."
 
@@ -6636,10 +6708,10 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr "URL der Aktualisierungsquelle"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
-msgstr "Ungültige Url"
+msgid "Invalid URL"
+msgstr "Ungültige URL"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
@@ -6671,5 +6743,6 @@
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
 msgid "Check the selected site(s) for new plugins or updates."
-msgstr "Die ausgewählte(n) Quelle(n) auf Aktualisierungen oder neue Plugins prüfen."
+msgstr ""
+"Die ausgewählte(n) Quelle(n) auf Aktualisierungen oder neue Plugins prüfen."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:155
@@ -6706,5 +6779,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen"
 
@@ -6780,5 +6853,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Lader ({0}): Automatisches Laden mit Zoom {1}"
 
@@ -6789,5 +6862,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 "
@@ -6859,7 +6933,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6923,6 +6997,7 @@
 
 #: ../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."
+msgid "Set start/end for routing. Middle mouse button to reset."
+msgstr ""
+"Setze Anfang/Ende für Routenberechnung. Zurücksetzen mit mittlerer Maustaste."
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
@@ -6972,5 +7047,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr "Straßen NRW Geofabrik.de"
 
@@ -7032,9 +7107,9 @@
 msgstr "Abgekürzter Straßenname"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Tunnelanfang"
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -7049,65 +7124,65 @@
 msgstr "Brücke"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr "Stadt"
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parken"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr "Einbahnstraße"
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr "Kirche"
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr "Tankstelle"
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hotel"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Restaurant"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Einkaufen"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr "WC"
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr "Camping"
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Autobahn"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Bundesstraße"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Landesstraße"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Ohne Klassifikation"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Ortsstraße"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr "Test"
@@ -8068,9 +8143,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr "Fallgatter"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Fallgatter bearbeiten"
 
@@ -8740,5 +8815,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr "Döner"
 
@@ -10605,5 +10680,5 @@
 #: trans_presets.java:2531
 msgid "Suburb"
-msgstr "Stadteil"
+msgstr "Stadtteil"
 
 #: trans_presets.java:2532
@@ -11082,3 +11157,2 @@
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
-
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 12692)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 12719)
@@ -9,6 +9,6 @@
 "Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 01:51+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 01:50+0000\n"
 "Last-Translator: Bruce Cowan <lp@bcowan.fastmail.co.uk>\n"
 "Language-Team: JOSM\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -137,7 +137,8 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
+#, fuzzy
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -173,11 +174,11 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#, fuzzy
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Possibly some missing tags."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Preparing data..."
@@ -200,36 +201,42 @@
 msgstr "Downloading points {0} to {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Unknown version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Found <nd> element in non-way."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> has zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+#, fuzzy
+msgid "Found <member> element in non-relation."
 msgstr "Found <member> tag on non-relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Missing required attribute \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+#, fuzzy
+msgid "Ill-formed node id"
 msgstr "Ill-formed Node id"
 
@@ -243,5 +250,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+#, fuzzy
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Provide a brief comment as to the changes to you are uploading:"
 
@@ -388,11 +396,11 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:481
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
+#, fuzzy, java-format
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed url: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+#, fuzzy, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file url: \"{0}\""
 
@@ -558,23 +566,26 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#, fuzzy
 msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
 "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
 "filename"
-msgstr ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
-"filename"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#, fuzzy
 msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
 "lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
-"lat=y&lon=x&zoom=z or a filename"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#, fuzzy
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -777,5 +788,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -787,5 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -831,5 +842,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -849,5 +860,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Role"
@@ -898,5 +909,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -918,18 +929,18 @@
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Create new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Edit new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Edit relation #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -943,46 +954,48 @@
 "sensible way."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Occupied By"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (empty value deletes tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+#, fuzzy
+msgid "Move the currently selected members up"
 msgstr "Move the currently selected member(s) up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#, fuzzy
+msgid "Move the currently selected members down"
 msgstr "Move the currently selected member(s) down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Add Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Add all currently selected objects as members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Delete Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Delete all currently selected objects from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Remove the member in the current table row from this relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -993,32 +1006,32 @@
 msgstr "Select"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Highlight the member from the current table row as JOSM's selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Members: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "There were conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Error parsing server response."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1032,5 +1045,5 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Cannot connect to server."
@@ -1058,5 +1071,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1151,14 +1164,14 @@
 msgstr "Merge the layer directly below into the selected layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1168,29 +1181,51 @@
 "Set the selected elements on the map to the selected items in the list above."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Zoom to selected element(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Refresh the selection list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Search for objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Selection: %d way(s) and %d node(s)"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} node)"
+msgstr[1] " ({0} nodes)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relation"
+msgstr[1] "relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Description: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1227,5 +1262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1334,5 +1369,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+#, fuzzy
+msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
@@ -1379,14 +1415,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
+#, fuzzy
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
-"track you were playing."
-msgstr ""
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
+msgstr ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#, fuzzy
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1395,5 +1433,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+#, fuzzy
+msgid "Unable to create new audio marker."
 msgstr "Unable to create new audio marker."
 
@@ -2040,8 +2079,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#, fuzzy
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -2059,6 +2099,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#, fuzzy
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -2364,5 +2405,5 @@
 "pressed"
 msgstr ""
-"The number of seconds to jump forward or back when the relevant button is "
+"The number of seconds to jump forwards or back when the relevant button is "
 "pressed"
 
@@ -2377,5 +2418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144
 msgid "Fast forward multiplier"
-msgstr ""
+msgstr "Fast forwards multiplier"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:148
@@ -2495,4 +2536,6 @@
 "way."
 msgstr ""
+"Wenn Ihr GPS Gerät zu wenig Linien zeichnet, sollte diese Option gewählt "
+"werden um die Linien entlang des Weges zu vervollständigen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
@@ -2698,4 +2741,15 @@
 "Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
 msgstr ""
+"<p>You may notice that the key selection list on the next page lists all "
+"keys that exist on all kinds of keyboards Java knows about, not just those "
+"keys that exist on your keyboard. Please use only those values that "
+"correspond to a real key on your keyboard. So if your keyboard has no 'Copy' "
+"key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
+"there will be 'keys' listed that correspond to a shortcut on your keyboard "
+"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
+"Semicolon on US keyboards, '.'/Full Stop on German keyboards, ...) instead. "
+"Not doing so may result in conflicts, as there is no way for JOSM to know "
+"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard..."
+"</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177
@@ -3157,9 +3211,9 @@
 msgstr "Could not load preferences from server."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "untagged"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "text"
@@ -3568,10 +3622,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "The selected node is not the inner part of any way."
 msgstr[1] "The selected nodes is not the inner part of any way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3581,9 +3636,9 @@
 "way also."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "The selected nodes do not share the same way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3591,10 +3646,10 @@
 msgstr[1] "The selected way does not contain all the selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "You must select two or more nodes to split a circular way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3604,5 +3659,5 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3612,5 +3667,5 @@
 "You should verify this and correct it when necessary."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3745,5 +3800,5 @@
 msgstr "Could not read \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3751,6 +3806,6 @@
 msgstr "Unknown file extension: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3759,29 +3814,29 @@
 msgstr "Markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Coordinates imported: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr "Malformed sentences: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Checksum errors: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Unknown sentences: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Zero coordinates: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "NMEA import success"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "NMEA import faliure!"
@@ -3810,11 +3865,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
-#, java-format
-msgid "Could not read from url: \"{0}\""
+#, fuzzy, java-format
+msgid "Could not read from URL: \"{0}\""
 msgstr "Could not read from url: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
-#, java-format
-msgid "Parsing error in url: \"{0}\""
+#, fuzzy, java-format
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Parsing error in url: \"{0}\""
 
@@ -4182,14 +4237,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#, fuzzy
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
-"move zoom with right button"
-msgstr ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
+msgstr ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Exit"
@@ -4238,5 +4294,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Move nodes so all angles are 90 or 270°"
 
@@ -4255,5 +4312,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+#, fuzzy
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Please select closed way(s) of at least four nodes."
 
@@ -4329,5 +4387,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+#, fuzzy
+msgid "Open an URL."
 msgstr "Open an URL."
 
@@ -4445,9 +4504,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "None of these nodes is glued to anything else."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "None of this way's nodes are glued to anything else."
 
@@ -4538,5 +4599,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
 msgid "Slower Forward"
-msgstr ""
+msgstr "Slower Forwards"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
@@ -4552,9 +4613,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:21
 msgid "Forward"
-msgstr "Forward"
+msgstr "Forwards"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:20
 msgid "Jump forward"
-msgstr ""
+msgstr "Jump forwards"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
@@ -4574,5 +4635,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
 msgid "Faster Forward"
-msgstr ""
+msgstr "Faster Forwards"
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -4694,7 +4755,8 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
+#, fuzzy
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "When reverting this way, the following changes to properties of the way and "
@@ -4727,5 +4789,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+#, fuzzy
+msgid "Can't duplicate unordered way."
 msgstr "Can't duplicate unnordered way."
 
@@ -4911,5 +4974,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Open OpenStreetBugs"
-msgstr ""
+msgstr "Open OpenStreetBugs"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:93
@@ -4928,9 +4991,11 @@
 "OpenStreetBugs"
 msgstr ""
+"The visible area is either too small or too big to download data from "
+"OpenStreetBugs"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 msgid "Warning"
-msgstr ""
+msgstr "Warning"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -4939,64 +5004,66 @@
 "upload these data. Maybe you have selected the wrong layer?"
 msgstr ""
+"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
+"upload this data. Perhaps you have selected the wrong layer."
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
 msgid "OpenStreetBugs download loop"
-msgstr ""
+msgstr "OpenStreetBugs download loop"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112
 msgid "Remote Control has been asked to load data from the API."
-msgstr ""
+msgstr "Remote Control has been asked to load data from the API."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
 #, java-format
 msgid "Request details: {0}"
-msgstr ""
+msgstr "Request details: {0}"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
 msgid "Do you want to allow this?"
-msgstr ""
+msgstr "Do you want to allow this?"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212
 msgid "Confirm Remote Control action"
-msgstr ""
+msgstr "Confirm Remote Control action"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209
 msgid "Remote Control has been asked to import data from the following URL:"
-msgstr ""
+msgstr "Remote Control has been asked to import data from the following URL:"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
 msgid "load data from API"
-msgstr ""
+msgstr "load data from API"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "change the selection"
-msgstr ""
+msgstr "change the selection"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "change the viewport"
-msgstr ""
+msgstr "change the viewport"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "confirm all Remote Control actions manually"
-msgstr ""
+msgstr "confirm all Remote Control actions manually"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
+msgstr "A plugin that allows JOSM to be controlled from other applications."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 #, java-format
 msgid "Version: {0}<br>Last change at {1}"
-msgstr ""
+msgstr "Version: {0}<br>Last change at {1}"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
-msgstr ""
+msgstr "Remote Control"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
-msgstr ""
+msgstr "Settings for the Remote Control plugin."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
@@ -5006,20 +5073,27 @@
 "talking to the plugin."
 msgstr ""
+"The Remote Control plugin will always listen on port 8111 on localhost.The "
+"port is not variable because it is referenced by external applications "
+"talking to the plugin."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
-msgstr ""
+msgstr "Permitted actions"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, Possibly some missing tags."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
 msgid "Please enter a search string"
-msgstr ""
+msgstr "Please enter a search string"
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:186
 msgid "Cannot read place search results from server"
-msgstr ""
+msgstr "Cannot read place search results from server"
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:206
 msgid "Enter a place name to search for:"
-msgstr ""
+msgstr "Enter a place name to search for:"
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:218
@@ -5048,19 +5122,19 @@
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:243
 msgid "near"
-msgstr ""
+msgstr "near"
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:238
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:244
 msgid "zoom"
-msgstr ""
+msgstr "zoom"
 
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:39
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40
 msgid "Import TCX File..."
-msgstr ""
+msgstr "Import TCX File..."
 
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:39
 msgid "Import TCX file as GPS track"
-msgstr ""
+msgstr "Import TCX file as GPS track"
 
 #: ../plugins/slippy_map_chooser/src/SlippyMapChooser.java:94
@@ -5069,128 +5143,130 @@
 "move mouse.   Select: Click."
 msgstr ""
+"Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+"move mouse.   Select: Click."
 
 #: ../plugins/slippy_map_chooser/src/SlippyMapChooser.java:97
 msgid "Slippy map"
-msgstr ""
+msgstr "Slippy map"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
 msgid "Direction index '{0}' not found"
-msgstr ""
+msgstr "Direction index '{0}' not found"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
 msgid "The starting location was not within the bbox"
-msgstr ""
+msgstr "The starting location was not within the bbox"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
 msgid "Looking for shoreline..."
-msgstr ""
+msgstr "Looking for shoreline..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
 #, java-format
 msgid "{0} nodes so far..."
-msgstr ""
+msgstr "{0} nodes so far..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
-msgstr ""
+msgstr "Lake Walker."
 
 #: ../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 ""
+msgstr "Lake Walker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
-msgstr ""
+msgstr "Error creating cache directory: {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
-msgstr ""
+msgstr "Tracing"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
-msgstr ""
+msgstr "checking cache..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
-msgstr ""
+msgstr "Running vertex reduction..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
-msgstr ""
+msgstr "Running Douglas-Peucker approximation..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
-msgstr ""
+msgstr "Removing duplicate nodes..."
 
 #: ../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"
-msgstr ""
+msgstr "Lakewalker trace"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
 msgid "Downloading image tile..."
-msgstr ""
+msgstr "Downloading image tile..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
 msgid "Could not acquire image"
-msgstr ""
+msgstr "Could not acquire image"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:36
 msgid "Maximum number of segments per way"
-msgstr ""
+msgstr "Maximum number of segments per way"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:38
 msgid "Maximum number of nodes in initial trace"
-msgstr ""
+msgstr "Maximum number of nodes in initial trace"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
 msgid "Maximum gray value to count as water (0-255)"
-msgstr ""
+msgstr "Maximum grey value to count as water (0-255)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Line simplification accuracy (degrees)"
-msgstr ""
+msgstr "Line simplification accuracy (degrees)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr ""
+msgstr "Resolution of Landsat tiles (pixels per degree)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Size of Landsat tiles (pixels)"
-msgstr ""
+msgstr "Size of Landsat tiles (pixels)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Shift all traces to east (degrees)"
-msgstr ""
+msgstr "Shift all traces to east (degrees)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Shift all traces to north (degrees)"
-msgstr ""
+msgstr "Shift all traces to north (degrees)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Direction to search for land"
-msgstr ""
+msgstr "Direction to search for land"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Tag ways as"
-msgstr ""
+msgstr "Tag ways as"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "WMS Layer"
-msgstr ""
+msgstr "WMS Layer"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Maximum cache size (MB)"
-msgstr ""
+msgstr "Maximum cache size (MB)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "Maximum cache age (days)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
+msgstr "Maximum number of segments allowed in each generated way. Default 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
@@ -5199,4 +5275,6 @@
 "lines). Default 50000."
 msgstr ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
@@ -5205,4 +5283,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
+"Maximum grey value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
@@ -5211,4 +5291,6 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
@@ -5216,77 +5298,78 @@
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr ""
+msgstr "Size of one landsat tile, measured in pixels. Default 2000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "Offset all points in East direction (degrees). Default 0."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "Offset all points in North direction (degrees). Default 0."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Direction to search for land. Default east."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
+msgstr "Tag ways as water, coastline, land or nothing. Default is water."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr ""
+msgstr "Which WMS layer to use for tracing against. Default is IR1."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr ""
+msgstr "Maximum size of each cache directory in bytes. Default is 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 ""
+msgstr "Maximum age of each cached file in days. Default is 100"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "An plugin to trace water bodies on Landsat imagery."
-msgstr ""
+msgstr "A plugin to trace water bodies on Landsat imagery."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Lakewalker Plugin Preferences"
-msgstr ""
+msgstr "Lakewalker Plugin Preferences"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
 msgid "Rotate 90"
-msgstr ""
+msgstr "Rotate 90"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
 msgid "Rotate 180"
-msgstr ""
+msgstr "Rotate 180"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
 msgid "Rotate 270"
-msgstr ""
+msgstr "Rotate 270"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
 msgid "Imported Images"
-msgstr ""
+msgstr "Imported Images"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:37
 msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr ""
+msgstr "Image files (*.jpg, *.jpeg, *.png, *.gif)"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Open images with ImageWayPoint"
-msgstr ""
+msgstr "Open images with ImageWayPoint"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:49
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:38
 msgid "Load set of images as a new layer."
-msgstr ""
+msgstr "Load set of images as a new layer."
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
@@ -5297,5 +5380,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
 msgid "Previous image"
-msgstr ""
+msgstr "Previous image"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
@@ -5306,43 +5389,43 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next image"
-msgstr ""
+msgstr "Next image"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
 msgid "Rotate left"
-msgstr ""
+msgstr "Rotate left"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
 msgid "Rotate image left"
-msgstr ""
+msgstr "Rotate image left"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
 msgid "Rotate right"
-msgstr ""
+msgstr "Rotate right"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
 msgid "Rotate image right"
-msgstr ""
+msgstr "Rotate image right"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr ""
+msgstr "WayPoint Image"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Display non-geotagged photos"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
-msgstr ""
+msgstr "OpenLayers"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
 msgid "Validation"
-msgstr ""
+msgstr "Validation"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
 msgid "Performs the data validation"
-msgstr ""
+msgstr "Performs the data validation"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
@@ -5351,29 +5434,29 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
 msgid "Validation errors"
-msgstr ""
+msgstr "Validation errors"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 msgid "Open the validation window."
-msgstr ""
+msgstr "Open the validation window."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
 msgid "Zoom to problem"
-msgstr ""
+msgstr "Zoom to problem"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
 msgid "Validate"
-msgstr ""
+msgstr "Validate"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
 msgid "Validate either current selection or complete dataset."
-msgstr ""
+msgstr "Validate either current selection or complete dataset."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
 msgid "Fix"
-msgstr ""
+msgstr "Fix"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
 msgid "Fix the selected errors."
-msgstr ""
+msgstr "Fix the selected errors."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
@@ -5383,13 +5466,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
 msgid "Ignore the selected errors next time."
-msgstr ""
+msgstr "Ignore the selected errors next time."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Whole group"
-msgstr ""
+msgstr "Whole group"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Single elements"
-msgstr ""
+msgstr "Single elements"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
@@ -5399,13 +5482,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
 msgid "Ignore whole group or individual elements?"
-msgstr ""
+msgstr "Ignore whole group or individual elements?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
 msgid "Ignoring elements"
-msgstr ""
+msgstr "Ignoring elements"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:161
 msgid "Grid"
-msgstr ""
+msgstr "Grid"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:275
@@ -5416,9 +5499,11 @@
 " {1}"
 msgstr ""
+"Error initialising test {0}:\n"
+" {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
 #, java-format
 msgid "{0}, ..."
-msgstr ""
+msgstr "{0}, ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
@@ -5428,5 +5513,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "validation error"
-msgstr ""
+msgstr "validation error"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
@@ -5436,5 +5521,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
 msgid "validation warning"
-msgstr ""
+msgstr "validation warning"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
@@ -5444,9 +5529,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
 msgid "validation other"
-msgstr ""
+msgstr "validation other"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:69
 msgid "Use ignore list."
-msgstr ""
+msgstr "Use ignore list."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:70
@@ -5456,9 +5541,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use error layer."
-msgstr ""
+msgstr "Use error layer."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "Use the error layer to display problematic elements."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
@@ -5468,5 +5553,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "On upload"
-msgstr ""
+msgstr "On upload"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:92
@@ -5475,46 +5560,48 @@
 "programs."
 msgstr ""
+"An OSM data validator that checks for common errors made by users and editor "
+"programs."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:94
 #, java-format
 msgid "Version {0} - Last change at {1}"
-msgstr ""
+msgstr "Version {0} - Last change at {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:95
 msgid "Data validator"
-msgstr ""
+msgstr "Data validator"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89
 msgid "No validation errors"
-msgstr ""
+msgstr "No validation errors"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:50
 msgid "Untagged, empty, and one node ways."
-msgstr ""
+msgstr "Untagged, empty and one node ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:51
 msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
+msgstr "This test checks for untagged, empty and one node ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:76
 msgid "Unnamed ways"
-msgstr ""
+msgstr "Unnamed ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:83
 msgid "Untagged ways"
-msgstr ""
+msgstr "Untagged ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Empty ways"
-msgstr ""
+msgstr "Empty ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
 msgid "One node ways"
-msgstr ""
+msgstr "One node ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:33
 msgid "Self-intersecting ways"
-msgstr ""
+msgstr "Self-intersecting ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
@@ -5522,8 +5609,9 @@
 "This test checks for ways that contain some of their nodes more than once."
 msgstr ""
+"This test checks for ways that contain some of their nodes more than once."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
 msgid "Crossing ways."
-msgstr ""
+msgstr "Crossing ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -5532,101 +5620,103 @@
 "layer, but are not connected by a node."
 msgstr ""
+"This test checks if two roads, railways or waterways crosses in the same "
+"layer, but are not connected by a node."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
 msgid "Crossing ways"
-msgstr ""
+msgstr "Crossing ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
 msgid "Duplicated way nodes."
-msgstr ""
+msgstr "Duplicated way nodes."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "Checks for ways with identical consecutive nodes."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "Duplicated way nodes"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
+msgstr "Replace \"{0}\" by \"{1}\" for"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
 msgid "Coastlines."
-msgstr ""
+msgstr "Coastlines."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "This test checks that coastlines are correct."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
 msgid "Unordered coastline"
-msgstr ""
+msgstr "Unordered coastline"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "Unclosed Ways."
-msgstr ""
+msgstr "Unclosed Ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "This tests if ways which should be circular are closed."
-msgstr ""
+msgstr "This tests if ways which should be circular are closed."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
 #, java-format
 msgid "natural type {0}"
-msgstr ""
+msgstr "natural type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "landuse type {0}"
-msgstr ""
+msgstr "landuse type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "amenities type {0}"
-msgstr ""
+msgstr "amenities type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "sport type {0}"
-msgstr ""
+msgstr "sport type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "tourism type {0}"
-msgstr ""
+msgstr "tourism type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "shop type {0}"
-msgstr ""
+msgstr "shop type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "leisure type {0}"
-msgstr ""
+msgstr "leisure type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "waterway type {0}"
-msgstr ""
+msgstr "waterway type {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 msgid "building"
-msgstr ""
+msgstr "building"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 msgid "area"
-msgstr ""
+msgstr "area"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:117
 msgid "Unclosed way"
-msgstr ""
+msgstr "Unclosed way"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
 msgid "Overlapping ways."
-msgstr ""
+msgstr "Overlapping ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
@@ -5635,80 +5725,82 @@
 "than one way."
 msgstr ""
+"This test checks that a connection between two nodes is not used by more "
+"than one way."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
 msgid "Overlapping areas"
-msgstr ""
+msgstr "Overlapping areas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr ""
+msgstr "Overlapping highways (with area)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
 msgid "Overlapping railways (with area)"
-msgstr ""
+msgstr "Overlapping railways (with area)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
 msgid "Overlapping ways (with area)"
-msgstr ""
+msgstr "Overlapping ways (with area)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
 msgid "Overlapping highways"
-msgstr ""
+msgstr "Overlapping highways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
 msgid "Overlapping railways"
-msgstr ""
+msgstr "Overlapping railways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
 msgid "Overlapping ways"
-msgstr ""
+msgstr "Overlapping ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
 msgid "Wrongly Ordered Ways."
-msgstr ""
+msgstr "Wrongly Ordered Ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr ""
+msgstr "This test checks the direction of water, land and coastline ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
 msgid "Reversed coastline: land not on left side"
-msgstr ""
+msgstr "Reversed coastline: land not on left side"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed water: land not on left side"
-msgstr ""
+msgstr "Reversed water: land not on left side"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed land: land not on left side"
-msgstr ""
+msgstr "Reversed land: land not on left side"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:43
 msgid "Unconnected ways."
-msgstr ""
+msgstr "Unconnected ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
 msgid "This test checks if a way has an endpoint very near to another way."
-msgstr ""
+msgstr "This test checks if a way has an endpoint very near to another way."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:76
 msgid "Way end node near other highway"
-msgstr ""
+msgstr "Way end node near other highway"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:102
 msgid "Way end node near other way"
-msgstr ""
+msgstr "Way end node near other way"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:123
 msgid "Way node near other way"
-msgstr ""
+msgstr "Way node near other way"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:141
 msgid "Connected way end node near other way"
-msgstr ""
+msgstr "Connected way end node near other way"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
 msgid "Similar named ways."
-msgstr ""
+msgstr "Similarly named ways."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
@@ -5716,47 +5808,48 @@
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
+"This test checks for ways with similar names that may have been misspelt."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
 msgid "Similar named ways"
-msgstr ""
+msgstr "Similarly named ways"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
 msgid "Nodes with same name"
-msgstr ""
+msgstr "Nodes with same name"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
 msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr ""
+msgstr "This test finds nodes that have the same name (might be duplicates)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
 msgid "Untagged nodes."
-msgstr ""
+msgstr "Untagged nodes."
 
 #: ../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 ""
+msgstr "This test checks for untagged nodes that are not part of any way."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
 msgid "Untagged and unconnected nodes"
-msgstr ""
+msgstr "Untagged and unconnected nodes"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:134
 msgid "Properties checker :"
-msgstr ""
+msgstr "Properties checker :"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:135
 msgid "This plugin checks for errors in property keys and values."
-msgstr ""
+msgstr "This plugin checks for errors in property keys and values."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:211
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
+msgstr "Invalid tagchecker line - {0}: {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:224
 #, java-format
 msgid "Invalid spellcheck line: {0}"
-msgstr ""
+msgstr "Invalid spellcheck line: {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:235
@@ -5766,62 +5859,64 @@
 "{0}"
 msgstr ""
+"Could not access data file(s):\n"
+"{0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:300
 msgid "Illegal tag/value combinations"
-msgstr ""
+msgstr "Illegal tag/value combinations"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:311
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr ""
+msgstr "Key ''{0}'' invalid."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:316
 msgid "Tags with empty values"
-msgstr ""
+msgstr "Tags with empty values"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:322
 msgid "Invalid property key"
-msgstr ""
+msgstr "Invalid property key"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:328
 msgid "Invalid white space in property key"
-msgstr ""
+msgstr "Invalid white space in property key"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:334
 msgid "Property values start or end with white space"
-msgstr ""
+msgstr "Property values start or end with white space"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:340
 msgid "Property values contain HTML entity"
-msgstr ""
+msgstr "Property values contain HTML entity"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:349
 #, java-format
 msgid "Key ''{0}'' unknown."
-msgstr ""
+msgstr "Key ''{0}'' unknown."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:350
 msgid "Unknown property values"
-msgstr ""
+msgstr "Unknown property values"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:360
 msgid "FIXMES"
-msgstr ""
+msgstr "FIXMES"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:402
 msgid "Check property keys."
-msgstr ""
+msgstr "Check property keys."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
+msgstr "Validate that property keys are valid checking against list of words."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:410
 msgid "Use complex property checker."
-msgstr ""
+msgstr "Use complex property checker."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:411
 msgid "Validate property values and tags using complex rules."
-msgstr ""
+msgstr "Validate property values and tags using complex rules."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
@@ -5829,19 +5924,22 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "TagChecker source"
-msgstr ""
+msgstr "TagChecker source"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#, fuzzy
 msgid ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
 "The sources (url or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:482
 msgid "Add a new source to the list."
-msgstr ""
+msgstr "Add a new source to the list."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:483
 msgid "Edit the selected source."
-msgstr ""
+msgstr "Edit the selected source."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
@@ -5851,75 +5949,75 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:506
 msgid "Check property values."
-msgstr ""
+msgstr "Check property values."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
 msgid "Validate that property values are valid checking against presets."
-msgstr ""
+msgstr "Validate that property values are valid checking against presets."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Check for FIXMES."
-msgstr ""
+msgstr "Check for FIXMES."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:515
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr ""
+msgstr "Looks for nodes or ways with FIXME in any property value."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:522
 msgid "Use default data file."
-msgstr ""
+msgstr "Use default data file."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 msgid "Use the default data file (recommended)."
-msgstr ""
+msgstr "Use the default data file (recommended)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
 msgid "Use default spellcheck file."
-msgstr ""
+msgstr "Use default spellcheck file."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527
 msgid "Use the default spellcheck file (recommended)."
-msgstr ""
+msgstr "Use the default spellcheck file (recommended)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Fix properties"
-msgstr ""
+msgstr "Fix properties"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
 msgid "Could not find element type"
-msgstr ""
+msgstr "Could not find element type"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Could not find warning level"
-msgstr ""
+msgstr "Could not find warning level"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 #, java-format
 msgid "Illegal expression ''{0}''"
-msgstr ""
+msgstr "Illegal expression ''{0}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 #, java-format
 msgid "Illegal regular expression ''{0}''"
-msgstr ""
+msgstr "Illegal regular expression ''{0}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
 msgid "Duplicated nodes."
-msgstr ""
+msgstr "Duplicated nodes."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "This test checks that there are no nodes at the very same location."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
 msgid "Duplicated nodes"
-msgstr ""
+msgstr "Duplicated nodes"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:108
 msgid "Data with errors. Upload anyway?"
-msgstr ""
+msgstr "Data with errors. Upload anyway?"
 
 #: ../plugins/livegps/livegps/LiveGpsLayer.java:25
 msgid "LiveGPS layer"
-msgstr ""
+msgstr "LiveGPS layer"
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41
@@ -5927,30 +6025,30 @@
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:68
 msgid "Capture GPS Track"
-msgstr ""
+msgstr "Capture GPS Track"
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
+msgstr "Connect to gpsd server and show current position in LiveGPS layer."
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:54
 msgid "Center Once"
-msgstr ""
+msgstr "Centre Once"
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53
 msgid "Center the LiveGPS layer to current position."
-msgstr ""
+msgstr "Centre the LiveGPS layer to current position."
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
-msgstr ""
+msgstr "Auto-Centre"
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:67
 msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
+msgstr "Continuously centre the LiveGPS layer to current position."
 
 #: ../plugins/livegps/livegps/LiveGpsPlugin.java:82
 msgid "LiveGPS"
-msgstr ""
+msgstr "LiveGPS"
 
 #: ../plugins/livegps/livegps/LiveGpsAcquirer.java:128
@@ -5975,9 +6073,9 @@
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:46
 msgid "Live GPS"
-msgstr ""
+msgstr "Live GPS"
 
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:45
 msgid "Show GPS data."
-msgstr ""
+msgstr "Show GPS data."
 
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:50
@@ -5987,5 +6085,5 @@
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr ""
+msgstr "Way Info"
 
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:58
@@ -6000,23 +6098,23 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor ..."
-msgstr ""
+msgstr "Surveyor ..."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr ""
+msgstr "Open surveyor tool."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr ""
+msgstr "Surveyor"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "Could not read surveyor definition: {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
 #, java-format
 msgid "Error parsing {0}: {1}"
-msgstr ""
+msgstr "Error parsing {0}: {1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
@@ -6031,18 +6129,18 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
-msgstr ""
+msgstr "AutoSave LiveData"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 msgid "Save captured data to file every minute."
-msgstr ""
+msgstr "Save captured data to file every minute."
 
 #: ../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 ""
+msgstr "Way: "
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr ""
+msgstr "Duplicate hotkey for button '{0}' - button will be ignored!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
@@ -6050,118 +6148,118 @@
 #, java-format
 msgid "Error while exporting {0}: {1}"
-msgstr ""
+msgstr "Error while exporting {0}: {1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
 msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-msgstr ""
+msgstr "SurveyorPlugin depends on LiveGpsPlugin!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
 msgid "LiveGpsPlugin not found, please install and activate."
-msgstr ""
+msgstr "LiveGpsPlugin not found, please install and activate."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:62
 msgid "SurveyorPlugin is disabled for the moment"
-msgstr ""
+msgstr "SurveyorPlugin is disabled for the moment"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:63
 msgid "SurveyorPlugin"
-msgstr ""
+msgstr "SurveyorPlugin"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:78
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr ""
+msgstr "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:58
 msgid "Slippy Map"
-msgstr ""
+msgstr "Slippy Map"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Load Tile"
-msgstr ""
+msgstr "Load Tile"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:77
 msgid "Show Tile Status"
-msgstr ""
+msgstr "Show Tile Status"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:90
 msgid "Request Update"
-msgstr ""
+msgstr "Request Update"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
-msgstr ""
+msgstr "Load All Tiles"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:328
 msgid "image not loaded"
-msgstr ""
+msgstr "image not loaded"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:75
 msgid "error loading metadata"
-msgstr ""
+msgstr "error loading metadata"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:89
 #, java-format
 msgid "requested: {0}"
-msgstr ""
+msgstr "requested: {0}"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:93
 msgid "error requesting update"
-msgstr ""
+msgstr "error requesting update"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:52
 msgid "Tile Sources"
-msgstr ""
+msgstr "Tile Sources"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
-msgstr ""
+msgstr "Position only"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
 msgid "Position, Time, Date, Speed"
-msgstr ""
+msgstr "Position, Time, Date, Speed"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr ""
+msgstr "Position, Time, Date, Speed, Altitude"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
 msgid "A By Time"
-msgstr ""
+msgstr "A By Time"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr ""
+msgstr "A By Distance"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
 msgid "B By Time"
-msgstr ""
+msgstr "B By Time"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr ""
+msgstr "B By Distance"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
 msgid "C By Time"
-msgstr ""
+msgstr "C By Time"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr ""
+msgstr "C By Distance"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
 msgid "Data Logging Format"
-msgstr ""
+msgstr "Data Logging Format"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
 msgid "Disable data logging if speed falls below"
-msgstr ""
+msgstr "Disable data logging if speed falls below"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
 msgid "Disable data logging if distance falls below"
-msgstr ""
+msgstr "Disable data logging if distance falls below"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr ""
+msgstr "Unknown logFormat"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -6171,5 +6269,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
 msgid "refresh the port list"
-msgstr ""
+msgstr "refresh the port list"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
@@ -6179,42 +6277,42 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
 msgid "Configure Device"
-msgstr ""
+msgstr "Configure Device"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
 msgid "Connection Error."
-msgstr ""
+msgstr "Connection Error."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
 msgid "configure the connected DG100"
-msgstr ""
+msgstr "configure the connected DG100"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
 msgid "delete data after import"
-msgstr ""
+msgstr "delete data after import"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
 msgid "Importing data from device."
-msgstr ""
+msgstr "Importing data from device."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr ""
+msgstr "Importing data from DG100..."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
 msgid "Error deleting data."
-msgstr ""
+msgstr "Error deleting data."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
 #, java-format
 msgid "imported data from {0}"
-msgstr ""
+msgstr "imported data from {0}"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
 msgid "No data found on device."
-msgstr ""
+msgstr "No data found on device."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
 msgid "Connection failed."
-msgstr ""
+msgstr "Connection failed."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
@@ -6224,13 +6322,17 @@
 "plugin/"
 msgstr ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 msgid "Globalsat Import"
-msgstr ""
+msgstr "Globalsat Import"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
-msgstr ""
+#, fuzzy
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "Import Data from Globalsat Datalogger DG100 into GPXLayer."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
@@ -6240,24 +6342,28 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
-msgstr ""
+msgstr "Simplify Way"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr ""
+msgstr "Delete unnecessary nodes from a way."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
+#, fuzzy
 msgid ""
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
+"Are you really sure to continue?"
+msgstr ""
 "The selected way(s) have nodes outside of the downloaded data region.This "
 "can lead to nodes beeing deleted accidentially.\n"
 "Are you really sure to continue?"
-msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
-msgstr ""
+msgstr "Please abort if you are not sure"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr ""
+msgstr "Please select at least one way to simplify."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -6271,5 +6377,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
 msgid "Are you sure?"
-msgstr ""
+msgstr "Are you sure?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136
@@ -6277,15 +6383,15 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Simplify Way (remove {0} node)"
+msgstr[1] "Simplify Way (remove {0} nodes)"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
 msgid "No image"
-msgstr ""
+msgstr "No image"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:438
 #, java-format
 msgid "Loading {0}"
-msgstr ""
+msgstr "Loading {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:440
@@ -6293,46 +6399,46 @@
 #, java-format
 msgid "Error on file {0}"
-msgstr ""
+msgstr "Error on file {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:36
 msgid "Open images with AgPifoJ..."
-msgstr ""
+msgstr "Open images with AgPifoJ..."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:91
 msgid "Extracting GPS locations from EXIF"
-msgstr ""
+msgstr "Extracting GPS locations from EXIF"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:97
 msgid "Read photos..."
-msgstr ""
+msgstr "Read photos..."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:184
 msgid "Correlate to GPX"
-msgstr ""
+msgstr "Correlate to GPX"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "{0} were found to be gps tagged."
-msgstr ""
+msgstr "{0} were found to be gps tagged."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
+msgstr "AgPifoJ - Geotagged pictures"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "Display geotagged photos"
-msgstr ""
+msgstr "Display geotagged photos"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
 msgid "Remove photo from layer"
-msgstr ""
+msgstr "Remove photo from layer"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
 msgid "Center view"
-msgstr ""
+msgstr "Centre view"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "Zoom best fit and 1:1"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:165
@@ -6341,13 +6447,15 @@
 "Altitude: "
 msgstr ""
+"\n"
+"Altitude: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:168
 msgid " km/h"
-msgstr ""
+msgstr " km/h"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:144
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr ""
+msgstr "File {0} is loaded yet under the name \"{1}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203
@@ -6357,20 +6465,23 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221
 msgid "Photo time (from exif):"
-msgstr ""
+msgstr "Photo time (from exif):"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:236
 msgid "Gps time (read from the above photo): "
-msgstr ""
+msgstr "Gps time (read from the above photo): "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:248
 msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr ""
+msgstr " [dd/mm/yyyy hh:mm:ss]"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256
 msgid "I'm in the timezone of: "
-msgstr ""
+msgstr "I'm in the timezone of: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:319
@@ -6381,9 +6492,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:328
 msgid "Open an other photo"
-msgstr ""
+msgstr "Open an other photo"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
+msgstr "Synchronise time from a photo of the GPS receiver"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
@@ -6392,4 +6503,6 @@
 "Please use the requested format"
 msgstr ""
+"Error while parsing the date.\n"
+"Please use the requested format"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389
@@ -6399,17 +6512,18 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:432
 msgid "<No GPX track loaded yet>"
-msgstr ""
+msgstr "<No GPX track loaded yet>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:438
 msgid "GPX track: "
-msgstr ""
+msgstr "GPX track: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
-msgstr ""
+#, fuzzy
+msgid "Open another GPX trace"
+msgstr "Open an other GPXtrace"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
 msgid "Timezone: "
-msgstr ""
+msgstr "Timezone: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:481
@@ -6420,8 +6534,9 @@
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
+"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
 msgid "Update position for: "
-msgstr ""
+msgstr "Update position for: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:519
@@ -6431,21 +6546,21 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:529
 msgid "Images with no exif position"
-msgstr ""
+msgstr "Images with no exif position"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:539
 msgid "Not yet tagged images"
-msgstr ""
+msgstr "Not yet tagged images"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:558
 msgid "Correlate images with GPX track"
-msgstr ""
+msgstr "Correlate images with GPX track"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:566
 msgid "You should select a GPX track"
-msgstr ""
+msgstr "You should select a GPX track"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:567
 msgid "No selected GPX track"
-msgstr ""
+msgstr "No selected GPX track"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:574
@@ -6455,8 +6570,10 @@
 "Expected format: {0}"
 msgstr ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
 msgid "Invalid timezone"
-msgstr ""
+msgstr "Invalid timezone"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
@@ -6466,38 +6583,41 @@
 "Expected format: {0}"
 msgstr ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:584
 msgid "Invalid offset"
-msgstr ""
+msgstr "Invalid offset"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:645
 #, java-format
 msgid "Found {0} matchs of {1} in GPX track {2}"
-msgstr ""
+msgstr "Found {0} matchs of {1} in GPX track {2}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:646
 msgid "GPX Track loaded"
-msgstr ""
+msgstr "GPX Track loaded"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 msgid "Upload Traces"
-msgstr ""
+msgstr "Upload Traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 msgid "Uploads traces to openstreetmap.org"
-msgstr ""
+msgstr "Uploads traces to openstreetmap.org"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
-msgstr ""
+#, fuzzy
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr "No GpxLayer selected. Cannot upload a trace."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
 msgid "Use"
-msgstr ""
+msgstr "Use"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
 msgid "Please select a scheme to use."
-msgstr ""
+msgstr "Please select a scheme to use."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
@@ -6507,9 +6627,9 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
 msgid "Please select the scheme to delete."
-msgstr ""
+msgstr "Please select the scheme to delete."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
 msgid "Use the selected scheme from the list."
-msgstr ""
+msgstr "Use the selected scheme from the list."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
@@ -6519,5 +6639,5 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Delete the selected scheme from the list."
-msgstr ""
+msgstr "Delete the selected scheme from the list."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
@@ -6527,49 +6647,51 @@
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:89
 msgid "Add Site"
-msgstr ""
+msgstr "Add Site"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+#, fuzzy
+msgid "Update Site URL"
+msgstr "Update Site URL"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
-msgstr ""
+#, fuzzy
+msgid "Invalid URL"
+msgstr "Invalid URL"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
 msgid "Delete Site(s)"
-msgstr ""
+msgstr "Delete Site(s)"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
 msgid "Please select the site to delete."
-msgstr ""
+msgstr "Please select the site to delete."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:123
 msgid "Check Site(s)"
-msgstr ""
+msgstr "Check Site(s)"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:127
 msgid "Please select the site(s) to check for updates."
-msgstr ""
+msgstr "Please select the site(s) to check for updates."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:151
 msgid "Add a new plugin site."
-msgstr ""
+msgstr "Add a new plugin site."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
 msgid "Delete the selected site(s) from the list."
-msgstr ""
+msgstr "Delete the selected site(s) from the list."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
 msgid "Check the selected site(s) for new plugins or updates."
-msgstr ""
+msgstr "Check the selected site(s) for new plugins or updates."
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:155
 msgid "Update Sites"
-msgstr ""
+msgstr "Update Sites"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
@@ -6579,5 +6701,5 @@
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:43
 msgid "Osmarender"
-msgstr ""
+msgstr "Osmarender"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:90
@@ -6586,50 +6708,53 @@
 "the preferences."
 msgstr ""
+"Firefox not found. Please set firefox executable in the Map Settings page of "
+"the preferences."
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:121
 msgid "osmarender options"
-msgstr ""
+msgstr "osmarender options"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:122
 msgid "Firefox executable"
-msgstr ""
+msgstr "Firefox executable"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
 msgid "Rectified Image ..."
-msgstr ""
+msgstr "Rectified Image ..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
-msgstr ""
+#, fuzzy
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
+msgstr "Download Rectified Image from Metacarta's Map Rectifer WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
 msgid "Metacarta Map Rectifier image id"
-msgstr ""
+msgstr "Metacarta Map Rectifier image id"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32
 #, java-format
 msgid "rectifier id={0}"
-msgstr ""
+msgstr "rectifier id={0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:139
 msgid "WMS"
-msgstr ""
+msgstr "WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:70
 msgid "Blank Layer"
-msgstr ""
+msgstr "Blank Layer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
-msgstr ""
+msgstr "Open a blank WMS layer to load data from a file"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "WMS Plugin Preferences"
-msgstr ""
+msgstr "WMS Plugin Preferences"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
+msgstr "Modify list of WMS servers displayed in the WMS plugin menu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
@@ -6641,44 +6766,44 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:71
 msgid "WMS URL"
-msgstr ""
+msgstr "WMS URL"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
 msgid "Menu Name (Default)"
-msgstr ""
+msgstr "Menu Name (Default)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
 msgid "WMS URL (Default)"
-msgstr ""
+msgstr "WMS URL (Default)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Enter a menu name and WMS URL"
-msgstr ""
+msgstr "Enter a menu name and WMS URL"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Copy Default"
-msgstr ""
+msgstr "Copy Default"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
 msgid "Please select the row to copy."
-msgstr ""
+msgstr "Please select the row to copy."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18
 #, java-format
 msgid "Download WMS tile from {0}"
-msgstr ""
+msgstr "Download WMS tile from {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:62
 msgid "Automatic downloading"
-msgstr ""
+msgstr "Automatic downloading"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
-#, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
-msgstr ""
+#, fuzzy, java-format
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
+msgstr "WMS layer ({0}), automaticaly downloading in zoom {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "WMS layer ({0}), downloading in zoom {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
@@ -6686,29 +6811,30 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
+"The requested area is too big. Please zoom in a little, or change resolution"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Download visible tiles"
-msgstr ""
+msgstr "Download visible tiles"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
 msgid "Change resolution"
-msgstr ""
+msgstr "Change resolution"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Save WMS layer to file"
-msgstr ""
+msgstr "Save WMS layer to file"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Load WMS layer from file"
-msgstr ""
+msgstr "Load WMS layer from file"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:280
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
+msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:281
 msgid "File Format Error"
-msgstr ""
+msgstr "File Format Error"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
@@ -6718,13 +6844,13 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:53
 msgid "Exception occurred"
-msgstr ""
+msgstr "Exception occurred"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
 msgid "Adjust WMS"
-msgstr ""
+msgstr "Adjust WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the WMS layer"
-msgstr ""
+msgstr "Adjust the position of the WMS layer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
@@ -6734,7 +6860,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "Help / About"
-msgstr ""
+msgstr "Help / About"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
+#, fuzzy
 msgid ""
 "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
@@ -6752,7 +6879,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6762,16 +6889,38 @@
 "use."
 msgstr ""
+"You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+"these will then show up in the WMS menu.\n"
+"\n"
+"You can also do this manually in the Advanced Preferences, using the "
+"following schema:\n"
+"wmsplugin.url.1.name=Landsat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE Maps... etc\n"
+"\n"
+"Full WMS URL input format example (landsat)\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+"format=image/jpeg \n"
+"\n"
+"For Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/), you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"this example,replacing 73 with your image id: \n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+" \n"
+"Note: Make sure the image is suitable copyright-wise if in doubt, don't use."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
 msgid "WMS Plugin Help"
-msgstr ""
+msgstr "WMS Plugin Help"
 
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr ""
+msgstr "Grid origin location"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
 msgid "Grid rotation"
-msgstr ""
+msgstr "Grid rotation"
 
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -6785,5 +6934,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr ""
+msgstr "Grid layer:"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
@@ -6792,15 +6941,16 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
-msgstr ""
+#, fuzzy
+msgid "Set start/end for routing. Middle mouse button to reset."
+msgstr "Set start/end for autorouting. Middle Mouse button resets."
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
 msgid "Navigation"
-msgstr ""
+msgstr "Navigation"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
 msgid "Reset Graph"
-msgstr ""
+msgstr "Reset Graph"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
@@ -6810,70 +6960,71 @@
 #: trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #: trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr ""
+msgstr "Open Aerial Map"
 
 #: trans_wms.java:8
 msgid "NPE Maps"
-msgstr ""
+msgstr "NPE Maps"
 
 #: trans_wms.java:13
 msgid "YAHOO (GNOME)"
-msgstr ""
+msgstr "YAHOO (GNOME)"
 
 #: trans_wms.java:14
 msgid "YAHOO (GNOME Fix)"
-msgstr ""
+msgstr "YAHOO (GNOME Fix)"
 
 #: trans_wms.java:15
 msgid "YAHOO (WebKit)"
-msgstr ""
+msgstr "YAHOO (WebKit)"
 
 #: trans_wms.java:16
 msgid "YAHOO (WebKit GTK)"
-msgstr ""
+msgstr "YAHOO (WebKit GTK+)"
 
 #: trans_wms.java:18
 msgid "Oberpfalz Geofabrik.de"
-msgstr ""
+msgstr "Oberpfalz Geofabrik.de"
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
-msgstr ""
+#, fuzzy
+msgid "Streets NRW Geofabrik.de"
+msgstr "Strassen NRW Geofabrik.de"
 
 #: trans_validator.java:38
 msgid "oneway tag on a node"
-msgstr ""
+msgstr "oneway tag on a node"
 
 #: trans_validator.java:39
 msgid "bridge tag on a node"
-msgstr ""
+msgstr "bridge tag on a node"
 
 #: trans_validator.java:40 trans_validator.java:41 trans_validator.java:42
 #: trans_validator.java:43 trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "wrong highway tag on a node"
 
 #: trans_validator.java:45 trans_validator.java:46
 msgid "highway without a reference"
-msgstr ""
+msgstr "highway without a reference"
 
 #: trans_validator.java:47
 msgid "temporary highway type"
-msgstr ""
+msgstr "temporary highway type"
 
 #: trans_validator.java:48
 msgid "misspelled key name"
-msgstr ""
+msgstr "misspelt key name"
 
 #: trans_validator.java:50
 msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "cycleway with tag bicycle"
 
 #: trans_validator.java:51
 msgid "footway with tag foot"
-msgstr ""
+msgstr "footway with tag foot"
 
 #: trans_validator.java:54
@@ -6883,27 +7034,27 @@
 #: trans_validator.java:55
 msgid "barrier used on a way"
-msgstr ""
+msgstr "barrier used on a way"
 
 #: trans_validator.java:58
 msgid "maxspeed used for footway"
-msgstr ""
+msgstr "maxspeed used for footway"
 
 #: trans_validator.java:60
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "layer tag with + sign"
 
 #: trans_validator.java:62
 msgid "street name contains ss"
-msgstr ""
+msgstr "street name contains ss"
 
 #: trans_validator.java:63
 msgid "abbreviated street name"
-msgstr ""
-
-#: trans_surveyor.java:6
+msgstr "abbreviated street name"
+
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
-msgstr ""
-
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+msgstr "Tunnel Start"
+
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6918,67 +7069,67 @@
 msgstr "Bridge"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
-msgstr ""
-
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+msgstr "Village/City"
+
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
-msgstr ""
-
-#: trans_surveyor.java:29
+msgstr "Parking"
+
+#: trans_surveyor.java:46
 msgid "One Way"
-msgstr ""
-
-#: trans_surveyor.java:33
+msgstr "One Way"
+
+#: trans_surveyor.java:50
 msgid "Church"
-msgstr ""
-
-#: trans_surveyor.java:38
+msgstr "Church"
+
+#: trans_surveyor.java:55
 msgid "Fuel Station"
-msgstr ""
-
-#: trans_surveyor.java:43 trans_presets.java:1453
+msgstr "Fuel Station"
+
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
-msgstr ""
-
-#: trans_surveyor.java:47 trans_presets.java:1507
+msgstr "Hotel"
+
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
-msgstr ""
-
-#: trans_surveyor.java:52
+msgstr "Restaurant"
+
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Shopping"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
-msgstr ""
-
-#: trans_surveyor.java:60
+msgstr "WC"
+
+#: trans_surveyor.java:77
 msgid "Camping"
-msgstr ""
-
-#: trans_surveyor.java:72 trans_presets.java:40
+msgstr "Camping"
+
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
-msgstr ""
-
-#: trans_surveyor.java:76 trans_presets.java:115
+msgstr "Motorway"
+
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
-msgstr ""
-
-#: trans_surveyor.java:80 trans_presets.java:151
+msgstr "Primary"
+
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
-msgstr ""
-
-#: trans_surveyor.java:84 trans_presets.java:188
+msgstr "Secondary"
+
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
-msgstr ""
-
-#: trans_surveyor.java:88 trans_presets.java:206
+msgstr "Unclassified"
+
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
-msgstr ""
-
-#: trans_surveyor.java:93 trans_surveyor.java:97
+msgstr "Residential"
+
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: specialmessages.java:6
@@ -6987,8 +7138,10 @@
 "area, or use planet.osm"
 msgstr ""
+"You requested too many nodes (limit is 50,000). Either request a smaller "
+"area, or use planet.osm"
 
 #: specialmessages.java:7
 msgid "Database offline for maintenance"
-msgstr ""
+msgstr "Database offline for maintenance"
 
 #: specialmessages.java:8
@@ -6997,16 +7150,18 @@
 "request a smaller area, or use planet.osm"
 msgstr ""
+"The maximum bbox size is 0.25, and your request was too large. Either "
+"request a smaller area, or use planet.osm."
 
 #: specialmessages.java:9
 msgid "could not get audio input stream from input URL"
-msgstr ""
+msgstr "could not get audio input stream from input URL"
 
 #: trans_presets.java:39
 msgid "Streets"
-msgstr ""
+msgstr "Streets"
 
 #: trans_presets.java:41
 msgid "Edit a Motorway"
-msgstr ""
+msgstr "Edit a Motorway"
 
 #: trans_presets.java:44 trans_presets.java:80 trans_presets.java:99
@@ -7014,5 +7169,5 @@
 #: trans_presets.java:1442
 msgid "Reference"
-msgstr ""
+msgstr "Reference"
 
 #: trans_presets.java:46 trans_presets.java:64 trans_presets.java:82
@@ -7034,5 +7189,5 @@
 #: trans_presets.java:1440 trans_presets.java:2124
 msgid "Optional Attributes:"
-msgstr ""
+msgstr "Optional Attributes:"
 
 #: trans_presets.java:49 trans_presets.java:66 trans_presets.java:85
@@ -7054,5 +7209,5 @@
 #: trans_presets.java:161 trans_presets.java:335
 msgid "Lanes"
-msgstr ""
+msgstr "Lanes"
 
 #: trans_presets.java:51 trans_presets.java:68 trans_presets.java:87
@@ -7064,5 +7219,5 @@
 #: trans_presets.java:623 trans_presets.java:1209
 msgid "Max. speed (km/h)"
-msgstr ""
+msgstr "Max. speed (km/h)"
 
 #: trans_presets.java:52 trans_presets.java:69 trans_presets.java:88
@@ -7075,5 +7230,5 @@
 #: trans_presets.java:460 trans_presets.java:616 trans_presets.java:1202
 msgid "Oneway"
-msgstr ""
+msgstr "Oneway"
 
 #: trans_presets.java:54 trans_presets.java:71 trans_presets.java:90
@@ -7088,5 +7243,5 @@
 #: trans_presets.java:1204
 msgid "Tunnel"
-msgstr ""
+msgstr "Tunnel"
 
 #: trans_presets.java:55 trans_presets.java:72 trans_presets.java:91
@@ -7101,5 +7256,5 @@
 #: trans_presets.java:1205
 msgid "Cutting"
-msgstr ""
+msgstr "Cutting"
 
 #: trans_presets.java:56 trans_presets.java:73 trans_presets.java:92
@@ -7114,57 +7269,57 @@
 #: trans_presets.java:1206
 msgid "Embankment"
-msgstr ""
+msgstr "Embankment"
 
 #: trans_presets.java:59
 msgid "Motorway Link"
-msgstr ""
+msgstr "Motorway Link"
 
 #: trans_presets.java:60
 msgid "Edit a Motorway Link"
-msgstr ""
+msgstr "Edit a Motorway Link"
 
 #: trans_presets.java:76
 msgid "Trunk"
-msgstr ""
+msgstr "Trunk"
 
 #: trans_presets.java:77
 msgid "Edit a Trunk"
-msgstr ""
+msgstr "Edit a Trunk"
 
 #: trans_presets.java:95
 msgid "Trunk Link"
-msgstr ""
+msgstr "Trunk Link"
 
 #: trans_presets.java:96
 msgid "Edit a Trunk Link"
-msgstr ""
+msgstr "Edit a Trunk Link"
 
 #: trans_presets.java:116
 msgid "Edit a Primary Road"
-msgstr ""
+msgstr "Edit a Primary Road"
 
 #: trans_presets.java:134
 msgid "Primary Link"
-msgstr ""
+msgstr "Primary Link"
 
 #: trans_presets.java:135
 msgid "Edit a Primary Link"
-msgstr ""
+msgstr "Edit a Primary Link"
 
 #: trans_presets.java:152
 msgid "Edit a Secondary Road"
-msgstr ""
+msgstr "Edit a Secondary Road"
 
 #: trans_presets.java:170
 msgid "Tertiary"
-msgstr ""
+msgstr "Tertiary"
 
 #: trans_presets.java:171
 msgid "Edit a Tertiary Road"
-msgstr ""
+msgstr "Edit a Tertiary Road"
 
 #: trans_presets.java:189
 msgid "Edit a Unclassified Road"
-msgstr ""
+msgstr "Edit a Unclassified Road"
 
 #: trans_presets.java:203 trans_presets.java:221 trans_presets.java:239
@@ -7179,9 +7334,9 @@
 #: trans_presets.java:1378 trans_presets.java:1421
 msgid "Width (metres)"
-msgstr ""
+msgstr "Width (metres)"
 
 #: trans_presets.java:207
 msgid "Edit a Residential Street"
-msgstr ""
+msgstr "Edit a Residential Street"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7192,5 +7347,5 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "Surface"
-msgstr ""
+msgstr "Surface"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7201,5 +7356,5 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "paved"
-msgstr ""
+msgstr "paved"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7208,5 +7363,5 @@
 #: trans_presets.java:466 trans_presets.java:622 trans_presets.java:1208
 msgid "unpaved"
-msgstr ""
+msgstr "unpaved"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7217,53 +7372,53 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "cobblestone"
-msgstr ""
+msgstr "cobblestone"
 
 #: trans_presets.java:224
 msgid "Living Street"
-msgstr ""
+msgstr "Living Street"
 
 #: trans_presets.java:225
 msgid "Edit a Living Street"
-msgstr ""
+msgstr "Edit a Living Street"
 
 #: trans_presets.java:242
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #: trans_presets.java:243
 msgid "Edit a Serviceway"
-msgstr ""
+msgstr "Edit a Serviceway"
 
 #: trans_presets.java:261
 msgid "Parking Aisle"
-msgstr ""
+msgstr "Parking Aisle"
 
 #: trans_presets.java:262
 msgid "Edit a Parking Aisle"
-msgstr ""
+msgstr "Edit a Parking Aisle"
 
 #: trans_presets.java:275
 msgid "Road (Unknown Type)"
-msgstr ""
+msgstr "Road (Unknown Type)"
 
 #: trans_presets.java:276
 msgid "Edit a Road of unknown type"
-msgstr ""
+msgstr "Edit a Road of unknown type"
 
 #: trans_presets.java:296
 msgid "Road Restrictions"
-msgstr ""
+msgstr "Road Restrictions"
 
 #: trans_presets.java:297
 msgid "Edit Road Restrictions"
-msgstr ""
+msgstr "Edit Road Restrictions"
 
 #: trans_presets.java:299
 msgid "Toll"
-msgstr ""
+msgstr "Toll"
 
 #: trans_presets.java:300
 msgid "No exit (cul-de-sac)"
-msgstr ""
+msgstr "No exit (cul-de-sac)"
 
 #: trans_presets.java:301 trans_presets.java:487 trans_presets.java:508
@@ -7271,5 +7426,5 @@
 #: trans_presets.java:592
 msgid "Access"
-msgstr ""
+msgstr "Access"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7300,5 +7455,5 @@
 #: trans_presets.java:593 trans_presets.java:594
 msgid "private"
-msgstr ""
+msgstr "private"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7315,5 +7470,5 @@
 #: trans_presets.java:610 trans_presets.java:611
 msgid "designated"
-msgstr ""
+msgstr "designated"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7341,5 +7496,5 @@
 #: trans_presets.java:593 trans_presets.java:594
 msgid "permissive"
-msgstr ""
+msgstr "permissive"
 
 #: trans_presets.java:301 trans_presets.java:305 trans_presets.java:308
@@ -7351,5 +7506,5 @@
 #: trans_presets.java:592 trans_presets.java:593 trans_presets.java:594
 msgid "agricultural"
-msgstr ""
+msgstr "agricultural"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7376,5 +7531,5 @@
 #: trans_presets.java:1014 trans_presets.java:1321 trans_presets.java:1391
 msgid "Bicycle"
-msgstr ""
+msgstr "Bicycle"
 
 #: trans_presets.java:303 trans_presets.java:611 trans_presets.java:745
@@ -7385,13 +7540,13 @@
 #: trans_presets.java:1013
 msgid "Foot"
-msgstr ""
+msgstr "Foot"
 
 #: trans_presets.java:304
 msgid "Goods"
-msgstr ""
+msgstr "Goods"
 
 #: trans_presets.java:305
 msgid "Heavy Goods Vehicles (hgv)"
-msgstr ""
+msgstr "Heavy Goods Vehicles (hgv)"
 
 #: trans_presets.java:306 trans_presets.java:608 trans_presets.java:834
@@ -7411,5 +7566,5 @@
 #: trans_presets.java:1016
 msgid "Motorcycle"
-msgstr ""
+msgstr "Motorcycle"
 
 #: trans_presets.java:308 trans_presets.java:489 trans_presets.java:510
@@ -7421,45 +7576,45 @@
 #: trans_presets.java:1017
 msgid "Motorcar"
-msgstr ""
+msgstr "Motorcar"
 
 #: trans_presets.java:309
 msgid "Public Service Vehicles (psv)"
-msgstr ""
+msgstr "Public Service Vehicles (psv)"
 
 #: trans_presets.java:310
 msgid "Motorboat"
-msgstr ""
+msgstr "Motorboat"
 
 #: trans_presets.java:311
 msgid "Boat"
-msgstr ""
+msgstr "Boat"
 
 #: trans_presets.java:313
 msgid "Min. speed (km/h)"
-msgstr ""
+msgstr "Min. speed (km/h)"
 
 #: trans_presets.java:314 trans_presets.java:349
 msgid "Max. weight (tonnes)"
-msgstr ""
+msgstr "Max. weight (tonnes)"
 
 #: trans_presets.java:315
 msgid "Max. Height (metres)"
-msgstr ""
+msgstr "Max. Height (metres)"
 
 #: trans_presets.java:316
 msgid "Max. Width (metres)"
-msgstr ""
+msgstr "Max. Width (metres)"
 
 #: trans_presets.java:317
 msgid "Max. Length (metres)"
-msgstr ""
+msgstr "Max. Length (metres)"
 
 #: trans_presets.java:320
 msgid "Roundabout"
-msgstr ""
+msgstr "Roundabout"
 
 #: trans_presets.java:321
 msgid "Edit a Junction"
-msgstr ""
+msgstr "Edit a Junction"
 
 #: trans_presets.java:324 trans_presets.java:605 trans_presets.java:743
@@ -7467,77 +7622,77 @@
 #: trans_presets.java:2789 trans_presets.java:2855 trans_presets.java:2876
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: trans_presets.java:324
 msgid "motorway"
-msgstr ""
+msgstr "motorway"
 
 #: trans_presets.java:324
 msgid "motorway_link"
-msgstr ""
+msgstr "motorway_link"
 
 #: trans_presets.java:324
 msgid "trunk"
-msgstr ""
+msgstr "trunk"
 
 #: trans_presets.java:324
 msgid "trunk_link"
-msgstr ""
+msgstr "trunk_link"
 
 #: trans_presets.java:324
 msgid "primary"
-msgstr ""
+msgstr "primary"
 
 #: trans_presets.java:324
 msgid "primary_link"
-msgstr ""
+msgstr "primary_link"
 
 #: trans_presets.java:324
 msgid "secondary"
-msgstr ""
+msgstr "secondary"
 
 #: trans_presets.java:324
 msgid "tertiary"
-msgstr ""
+msgstr "tertiary"
 
 #: trans_presets.java:324
 msgid "unclassified"
-msgstr ""
+msgstr "unclassified"
 
 #: trans_presets.java:324
 msgid "residential"
-msgstr ""
+msgstr "residential"
 
 #: trans_presets.java:324
 msgid "living_street"
-msgstr ""
+msgstr "living_street"
 
 #: trans_presets.java:324
 msgid "service"
-msgstr ""
+msgstr "service"
 
 #: trans_presets.java:324
 msgid "bus_guideway"
-msgstr ""
+msgstr "bus_guideway"
 
 #: trans_presets.java:324
 msgid "construction"
-msgstr ""
+msgstr "construction"
 
 #: trans_presets.java:340
 msgid "Edit a Bridge"
-msgstr ""
+msgstr "Edit a Bridge"
 
 #: trans_presets.java:354
 msgid "Ways"
-msgstr ""
+msgstr "Ways"
 
 #: trans_presets.java:355
 msgid "Construction"
-msgstr ""
+msgstr "Construction"
 
 #: trans_presets.java:356
 msgid "Edit a highway under construction"
-msgstr ""
+msgstr "Edit a highway under construction"
 
 #: trans_presets.java:370
@@ -7547,217 +7702,217 @@
 #: trans_presets.java:370
 msgid "roundabout"
-msgstr ""
+msgstr "roundabout"
 
 #: trans_presets.java:377
 msgid "Bridleway"
-msgstr ""
+msgstr "Bridleway"
 
 #: trans_presets.java:378
 msgid "Edit a Bridleway"
-msgstr ""
+msgstr "Edit a Bridleway"
 
 #: trans_presets.java:396
 msgid "Cycleway"
-msgstr ""
+msgstr "Cycleway"
 
 #: trans_presets.java:397
 msgid "Edit a Cycleway"
-msgstr ""
+msgstr "Edit a Cycleway"
 
 #: trans_presets.java:415
 msgid "Footway"
-msgstr ""
+msgstr "Footway"
 
 #: trans_presets.java:416
 msgid "Edit a Footway"
-msgstr ""
+msgstr "Edit a Footway"
 
 #: trans_presets.java:434
 msgid "Pedestrian"
-msgstr ""
+msgstr "Pedestrian"
 
 #: trans_presets.java:435
 msgid "Edit a Pedestrian Street"
-msgstr ""
+msgstr "Edit a Pedestrian Street"
 
 #: trans_presets.java:452
 msgid "Steps"
-msgstr ""
+msgstr "Steps"
 
 #: trans_presets.java:453
 msgid "Edit a flight of Steps"
-msgstr ""
+msgstr "Edit a flight of Steps"
 
 #: trans_presets.java:473
 msgid "Track"
-msgstr ""
+msgstr "Track"
 
 #: trans_presets.java:474
 msgid "Edit a Track"
-msgstr ""
+msgstr "Edit a Track"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "gravel"
-msgstr ""
+msgstr "gravel"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "ground"
-msgstr ""
+msgstr "ground"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "grass"
-msgstr ""
+msgstr "grass"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "sand"
-msgstr ""
+msgstr "sand"
 
 #: trans_presets.java:493
 msgid "Track Grade 1"
-msgstr ""
+msgstr "Track Grade 1"
 
 #: trans_presets.java:494
 msgid "Edit a Track of grade 1"
-msgstr ""
+msgstr "Edit a Track of grade 1"
 
 #: trans_presets.java:514
 msgid "Track Grade 2"
-msgstr ""
+msgstr "Track Grade 2"
 
 #: trans_presets.java:515
 msgid "Edit a Track of grade 2"
-msgstr ""
+msgstr "Edit a Track of grade 2"
 
 #: trans_presets.java:535
 msgid "Track Grade 3"
-msgstr ""
+msgstr "Track Grade 3"
 
 #: trans_presets.java:536
 msgid "Edit a Track of grade 3"
-msgstr ""
+msgstr "Edit a Track of grade 3"
 
 #: trans_presets.java:556
 msgid "Track Grade 4"
-msgstr ""
+msgstr "Track Grade 4"
 
 #: trans_presets.java:557
 msgid "Edit a Track of grade 4"
-msgstr ""
+msgstr "Edit a Track of grade 4"
 
 #: trans_presets.java:577
 msgid "Track Grade 5"
-msgstr ""
+msgstr "Track Grade 5"
 
 #: trans_presets.java:578
 msgid "Edit a Track of grade 5"
-msgstr ""
+msgstr "Edit a Track of grade 5"
 
 #: trans_presets.java:600
 msgid "Path"
-msgstr ""
+msgstr "Path"
 
 #: trans_presets.java:601
 msgid "Edit Path"
-msgstr ""
+msgstr "Edit Path"
 
 #: trans_presets.java:607
 msgid "Snowmobile"
-msgstr ""
+msgstr "Snowmobile"
 
 #: trans_presets.java:610
 msgid "Ski"
-msgstr ""
+msgstr "Ski"
 
 #: trans_presets.java:628
 msgid "Hiking"
-msgstr ""
+msgstr "Hiking"
 
 #: trans_presets.java:629
 msgid "Edit Hiking"
-msgstr ""
+msgstr "Edit Hiking"
 
 #: trans_presets.java:640
 msgid "Mountain Hiking"
-msgstr ""
+msgstr "Mountain Hiking"
 
 #: trans_presets.java:641
 msgid "Edit Mountain Hiking"
-msgstr ""
+msgstr "Edit Mountain Hiking"
 
 #: trans_presets.java:652
 msgid "Demanding Mountain Hiking"
-msgstr ""
+msgstr "Demanding Mountain Hiking"
 
 #: trans_presets.java:653
 msgid "Edit Demanding Mountain Hiking"
-msgstr ""
+msgstr "Edit Demanding Mountain Hiking"
 
 #: trans_presets.java:664
 msgid "Alpine Hiking"
-msgstr ""
+msgstr "Alpine Hiking"
 
 #: trans_presets.java:665
 msgid "Edit Alpine Hiking"
-msgstr ""
+msgstr "Edit Alpine Hiking"
 
 #: trans_presets.java:676
 msgid "Demanding alpine hiking"
-msgstr ""
+msgstr "Demanding alpine hiking"
 
 #: trans_presets.java:677
 msgid "Edit Demanding alpine hiking"
-msgstr ""
+msgstr "Edit Demanding alpine hiking"
 
 #: trans_presets.java:688
 msgid "Difficult alpine hiking"
-msgstr ""
+msgstr "Difficult alpine hiking"
 
 #: trans_presets.java:689
 msgid "Edit Difficult alpine hiking"
-msgstr ""
+msgstr "Edit Difficult alpine hiking"
 
 #: trans_presets.java:701
 msgid "Waypoints"
-msgstr ""
+msgstr "Waypoints"
 
 #: trans_presets.java:702
 msgid "Motorway Junction"
-msgstr ""
+msgstr "Motorway Junction"
 
 #: trans_presets.java:703
 msgid "Edit Motorway Junction"
-msgstr ""
+msgstr "Edit Motorway Junction"
 
 #: trans_presets.java:707
 msgid "Number"
-msgstr ""
+msgstr "Number"
 
 #: trans_presets.java:710
 msgid "Highway Exit"
-msgstr ""
+msgstr "Highway Exit"
 
 #: trans_presets.java:711
 msgid "Edit an Exit"
-msgstr ""
+msgstr "Edit an Exit"
 
 #: trans_presets.java:715
 msgid "Exit Number"
-msgstr ""
+msgstr "Exit Number"
 
 #: trans_presets.java:716
 msgid "Exit Name"
-msgstr ""
+msgstr "Exit Name"
 
 #: trans_presets.java:719
 msgid "Services"
-msgstr ""
+msgstr "Services"
 
 #: trans_presets.java:720
 msgid "Edit Service Station"
-msgstr ""
+msgstr "Edit Service Station"
 
 #: trans_presets.java:727 trans_presets.java:989 trans_presets.java:1272
@@ -7768,106 +7923,106 @@
 #: trans_presets.java:2359
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #: trans_presets.java:732
 msgid "Traffic Signal"
-msgstr ""
+msgstr "Traffic Lights"
 
 #: trans_presets.java:736
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: trans_presets.java:740
 msgid "Zebra Crossing"
-msgstr ""
+msgstr "Zebra Crossing"
 
 #: trans_presets.java:741
 msgid "Edit a crossing"
-msgstr ""
+msgstr "Edit a crossing"
 
 #: trans_presets.java:743
 msgid "uncontrolled"
-msgstr ""
+msgstr "uncontrolled"
 
 #: trans_presets.java:743
 msgid "island"
-msgstr ""
+msgstr "island"
 
 #: trans_presets.java:744
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #: trans_presets.java:744
 msgid "zebra"
-msgstr ""
+msgstr "zebra"
 
 #: trans_presets.java:744
 msgid "pelican"
-msgstr ""
+msgstr "pelican"
 
 #: trans_presets.java:749
 msgid "Mini Roundabout"
-msgstr ""
+msgstr "Mini Roundabout"
 
 #: trans_presets.java:753
 msgid "Turning Circle"
-msgstr ""
+msgstr "Turning Circle"
 
 #: trans_presets.java:757
 msgid "City Limit"
-msgstr ""
+msgstr "City Limit"
 
 #: trans_presets.java:758
 msgid "Edit a city limit sign"
-msgstr ""
+msgstr "Edit a city limit sign"
 
 #: trans_presets.java:763
 msgid "Second Name"
-msgstr ""
+msgstr "Second Name"
 
 #: trans_presets.java:766
 msgid "Signpost"
-msgstr ""
+msgstr "Signpost"
 
 #: trans_presets.java:770
 msgid "Speed Camera"
-msgstr ""
+msgstr "Speed Camera"
 
 #: trans_presets.java:774
 msgid "Emergency Phone"
-msgstr ""
+msgstr "Emergency Phone"
 
 #: trans_presets.java:780
 msgid "Ford"
-msgstr ""
+msgstr "Ford"
 
 #: trans_presets.java:781
 msgid "Edit Ford"
-msgstr ""
+msgstr "Edit Ford"
 
 #: trans_presets.java:790
 msgid "Mountain Pass"
-msgstr ""
+msgstr "Mountain Pass"
 
 #: trans_presets.java:791
 msgid "Edit Mountain Pass"
-msgstr ""
+msgstr "Edit Mountain Pass"
 
 #: trans_presets.java:798 trans_presets.java:1488 trans_presets.java:2810
 #: trans_presets.java:2817 trans_presets.java:2824
 msgid "Elevation"
-msgstr ""
+msgstr "Elevation"
 
 #: trans_presets.java:804
 msgid "Barriers"
-msgstr ""
+msgstr "Barriers"
 
 #: trans_presets.java:806
 msgid "Stile"
-msgstr ""
+msgstr "Stile"
 
 #: trans_presets.java:807
 msgid "Edit a Stile"
-msgstr ""
+msgstr "Edit a Stile"
 
 #: trans_presets.java:810 trans_presets.java:820 trans_presets.java:830
@@ -7877,277 +8032,279 @@
 #: trans_presets.java:996 trans_presets.java:1011
 msgid "Allowed traffic:"
-msgstr ""
+msgstr "Allowed traffic:"
 
 #: trans_presets.java:816
 msgid "Kissing Gate"
-msgstr ""
+msgstr "Kissing Gate"
 
 #: trans_presets.java:817
 msgid "Edit a Kissing Gate"
-msgstr ""
+msgstr "Edit a Kissing Gate"
 
 #: trans_presets.java:826
 msgid "Hampshire Gate"
-msgstr ""
+msgstr "Hampshire Gate"
 
 #: trans_presets.java:827
 msgid "Edit a Hampshire Gate"
-msgstr ""
+msgstr "Edit a Hampshire Gate"
 
 #: trans_presets.java:839
 msgid "Bollard"
-msgstr ""
+msgstr "Bollard"
 
 #: trans_presets.java:840
 msgid "Edit a bollard"
-msgstr ""
+msgstr "Edit a bollard"
 
 #: trans_presets.java:851
 msgid "Drawbridge"
-msgstr ""
+msgstr "Drawbridge"
 
 #: trans_presets.java:852
 msgid "Edit a Drawbridge"
-msgstr ""
+msgstr "Edit a Drawbridge"
 
 #: trans_presets.java:864
 msgid "Bus Trap"
-msgstr ""
+msgstr "Bus Trap"
 
 #: trans_presets.java:868
 msgid "Cattle Grid"
-msgstr ""
+msgstr "Cattle Grid"
 
 #: trans_presets.java:869
 msgid "Edit a Cattle Grid"
-msgstr ""
+msgstr "Edit a Cattle Grid"
 
 #: trans_presets.java:880
 msgid "Spikes"
-msgstr ""
+msgstr "Spikes"
 
 #: trans_presets.java:881
 msgid "Edit a Spikes"
-msgstr ""
+msgstr "Edit a Spikes"
 
 #: trans_presets.java:893
-msgid "Porticullis"
-msgstr ""
+#, fuzzy
+msgid "Portcullis"
+msgstr "Portcullis"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
-msgstr ""
+#, fuzzy
+msgid "Edit a Portcullis"
+msgstr "Edit a Portcullis"
 
 #: trans_presets.java:905
 msgid "Gate"
-msgstr ""
+msgstr "Gate"
 
 #: trans_presets.java:906
 msgid "Edit a Gate"
-msgstr ""
+msgstr "Edit a Gate"
 
 #: trans_presets.java:918
 msgid "Lift Gate"
-msgstr ""
+msgstr "Lift Gate"
 
 #: trans_presets.java:919
 msgid "Edit a Lift Gate"
-msgstr ""
+msgstr "Edit a Lift Gate"
 
 #: trans_presets.java:931
 msgid "Sally Port"
-msgstr ""
+msgstr "Sally Port"
 
 #: trans_presets.java:932
 msgid "Edit a Sally Port"
-msgstr ""
+msgstr "Edit a Sally Port"
 
 #: trans_presets.java:944
 msgid "Bump Gate"
-msgstr ""
+msgstr "Bump Gate"
 
 #: trans_presets.java:945
 msgid "Edit a Bump Gate"
-msgstr ""
+msgstr "Edit a Bump Gate"
 
 #: trans_presets.java:957
 msgid "Hedge"
-msgstr ""
+msgstr "Hedge"
 
 #: trans_presets.java:961
 msgid "Fence"
-msgstr ""
+msgstr "Fence"
 
 #: trans_presets.java:965
 msgid "Block"
-msgstr ""
+msgstr "Block"
 
 #: trans_presets.java:969
 msgid "Wall"
-msgstr ""
+msgstr "Wall"
 
 #: trans_presets.java:973
 msgid "City Wall"
-msgstr ""
+msgstr "City Wall"
 
 #: trans_presets.java:977
 msgid "Retaining Wall"
-msgstr ""
+msgstr "Retaining Wall"
 
 #: trans_presets.java:981
 msgid "Toll Booth"
-msgstr ""
+msgstr "Toll Booth"
 
 #: trans_presets.java:982
 msgid "Edit Toll Booth"
-msgstr ""
+msgstr "Edit Toll Booth"
 
 #: trans_presets.java:992
 msgid "Border Control"
-msgstr ""
+msgstr "Border Control point"
 
 #: trans_presets.java:993
 msgid "Edit a Border Control"
-msgstr ""
+msgstr "Edit a Border Control point"
 
 #: trans_presets.java:1007
 msgid "Entrance"
-msgstr ""
+msgstr "Entrance"
 
 #: trans_presets.java:1008
 msgid "Edit a Entrance"
-msgstr ""
+msgstr "Edit an Entrance"
 
 #: trans_presets.java:1029
 msgid "Waterway"
-msgstr ""
+msgstr "Waterway"
 
 #: trans_presets.java:1030
 msgid "River"
-msgstr ""
+msgstr "River"
 
 #: trans_presets.java:1031
 msgid "Edit a River"
-msgstr ""
+msgstr "Edit a River"
 
 #: trans_presets.java:1038
 msgid "Canal"
-msgstr ""
+msgstr "Canal"
 
 #: trans_presets.java:1039
 msgid "Edit a Canal"
-msgstr ""
+msgstr "Edit a Canal"
 
 #: trans_presets.java:1046
 msgid "Drain"
-msgstr ""
+msgstr "Drain"
 
 #: trans_presets.java:1047
 msgid "Edit a Drain"
-msgstr ""
+msgstr "Edit a Drain"
 
 #: trans_presets.java:1054
 msgid "Stream"
-msgstr ""
+msgstr "Stream"
 
 #: trans_presets.java:1055
 msgid "Edit a Stream"
-msgstr ""
+msgstr "Edit a Stream"
 
 #: trans_presets.java:1064
 msgid "Ferry Route"
-msgstr ""
+msgstr "Ferry Route"
 
 #: trans_presets.java:1065
 msgid "Edit a Ferry"
-msgstr ""
+msgstr "Edit a Ferry"
 
 #: trans_presets.java:1076
 msgid "Boatyard"
-msgstr ""
+msgstr "Boatyard"
 
 #: trans_presets.java:1077
 msgid "Edit a Boatyard"
-msgstr ""
+msgstr "Edit a Boatyard"
 
 #: trans_presets.java:1083
 msgid "Dock"
-msgstr ""
+msgstr "Dock"
 
 #: trans_presets.java:1084
 msgid "Edit a Dock"
-msgstr ""
+msgstr "Edit a Dock"
 
 #: trans_presets.java:1092
 msgid "Dam"
-msgstr ""
+msgstr "Dam"
 
 #: trans_presets.java:1093
 msgid "Edit a Dam"
-msgstr ""
+msgstr "Edit a Dam"
 
 #: trans_presets.java:1100
 msgid "Waterway Point"
-msgstr ""
+msgstr "Waterway Point"
 
 #: trans_presets.java:1101
 msgid "Lock Gate"
-msgstr ""
+msgstr "Lock Gate"
 
 #: trans_presets.java:1105
 msgid "Weir"
-msgstr ""
+msgstr "Weir"
 
 #: trans_presets.java:1106
 msgid "Edit a Weir"
-msgstr ""
+msgstr "Edit a Weir"
 
 #: trans_presets.java:1112
 msgid "Waterfall"
-msgstr ""
+msgstr "Waterfall"
 
 #: trans_presets.java:1113
 msgid "Edit a Waterfall"
-msgstr ""
+msgstr "Edit a Waterfall"
 
 #: trans_presets.java:1119
 msgid "Turning Point"
-msgstr ""
+msgstr "Turning Point"
 
 #: trans_presets.java:1123
 msgid "Marina"
-msgstr ""
+msgstr "Marina"
 
 #: trans_presets.java:1124
 msgid "Edit Marina"
-msgstr ""
+msgstr "Edit Marina"
 
 #: trans_presets.java:1129
 msgid "Ferry Terminal"
-msgstr ""
+msgstr "Ferry Terminal"
 
 #: trans_presets.java:1130
 msgid "Edit Ferry Terminal"
-msgstr ""
+msgstr "Edit Ferry Terminal"
 
 #: trans_presets.java:1135
 msgid "Slipway"
-msgstr ""
+msgstr "Slipway"
 
 #: trans_presets.java:1136
 msgid "Edit Slipway"
-msgstr ""
+msgstr "Edit Slipway"
 
 #: trans_presets.java:1144
 msgid "Railway"
-msgstr ""
+msgstr "Railway"
 
 #: trans_presets.java:1145
 msgid "Rail"
-msgstr ""
+msgstr "Railway"
 
 #: trans_presets.java:1146
 msgid "Edit a Rail"
-msgstr ""
+msgstr "Edit a Railway"
 
 #: trans_presets.java:1149 trans_presets.java:1156 trans_presets.java:1163
@@ -8155,5 +8312,5 @@
 #: trans_presets.java:1191 trans_presets.java:1219
 msgid "Optional Types"
-msgstr ""
+msgstr "Optional Types"
 
 #: trans_presets.java:1149 trans_presets.java:1156 trans_presets.java:1163
@@ -8161,5 +8318,5 @@
 #: trans_presets.java:1191 trans_presets.java:1219
 msgid "yard"
-msgstr ""
+msgstr "yard"
 
 #: trans_presets.java:1149 trans_presets.java:1156 trans_presets.java:1163
@@ -8167,5 +8324,5 @@
 #: trans_presets.java:1191 trans_presets.java:1219
 msgid "siding"
-msgstr ""
+msgstr "siding"
 
 #: trans_presets.java:1149 trans_presets.java:1156 trans_presets.java:1163
@@ -8173,988 +8330,989 @@
 #: trans_presets.java:1191 trans_presets.java:1219
 msgid "spur"
-msgstr ""
+msgstr "spur"
 
 #: trans_presets.java:1152
 msgid "Narrow Gauge Rail"
-msgstr ""
+msgstr "Narrow Gauge Railway"
 
 #: trans_presets.java:1153
 msgid "Edit a Narrow Gauge Rail"
-msgstr ""
+msgstr "Edit a Narrow Gauge Railway"
 
 #: trans_presets.java:1159
 msgid "Monorail"
-msgstr ""
+msgstr "Monorail"
 
 #: trans_presets.java:1160
 msgid "Edit a Monorail"
-msgstr ""
+msgstr "Edit a Monorail"
 
 #: trans_presets.java:1166
 msgid "Preserved"
-msgstr ""
+msgstr "Preserved"
 
 #: trans_presets.java:1167
 msgid "Edit a Preserved Railway"
-msgstr ""
+msgstr "Edit a Preserved Railway"
 
 #: trans_presets.java:1173
 msgid "Light Rail"
-msgstr ""
+msgstr "Light Rail"
 
 #: trans_presets.java:1174
 msgid "Edit a Light Rail"
-msgstr ""
+msgstr "Edit a Light Rail"
 
 #: trans_presets.java:1180
 msgid "Subway"
-msgstr ""
+msgstr "Subway"
 
 #: trans_presets.java:1181
 msgid "Edit a Subway"
-msgstr ""
+msgstr "Edit a Subway"
 
 #: trans_presets.java:1187
 msgid "Tram"
-msgstr ""
+msgstr "Tram"
 
 #: trans_presets.java:1188
 msgid "Edit a Tram"
-msgstr ""
+msgstr "Edit a Tram"
 
 #: trans_presets.java:1194
 msgid "Bus Guideway"
-msgstr ""
+msgstr "Bus Guideway"
 
 #: trans_presets.java:1195
 msgid "Edit a Bus Guideway"
-msgstr ""
+msgstr "Edit a Bus Guideway"
 
 #: trans_presets.java:1215
 msgid "Disused Rail"
-msgstr ""
+msgstr "Disused Rail"
 
 #: trans_presets.java:1216
 msgid "Edit a Disused Railway"
-msgstr ""
+msgstr "Edit a Disused Railway"
 
 #: trans_presets.java:1222
 msgid "Abandoned Rail"
-msgstr ""
+msgstr "Abandoned Rail"
 
 #: trans_presets.java:1228
 msgid "Level Crossing"
-msgstr ""
+msgstr "Level Crossing"
 
 #: trans_presets.java:1232
 msgid "Crossing"
-msgstr ""
+msgstr "Crossing"
 
 #: trans_presets.java:1236
 msgid "Turntable"
-msgstr ""
+msgstr "Turntable"
 
 #: trans_presets.java:1242
 msgid "Aerialway"
-msgstr ""
+msgstr "Aerialway"
 
 #: trans_presets.java:1243
 msgid "Chair Lift"
-msgstr ""
+msgstr "Chair Lift"
 
 #: trans_presets.java:1244
 msgid "Edit a Chair Lift"
-msgstr ""
+msgstr "Edit a Chair Lift"
 
 #: trans_presets.java:1248
 msgid "Drag Lift"
-msgstr ""
+msgstr "Drag Lift"
 
 #: trans_presets.java:1249
 msgid "Edit a Drag Lift"
-msgstr ""
+msgstr "Edit a Drag Lift"
 
 #: trans_presets.java:1253
 msgid "Cable Car"
-msgstr ""
+msgstr "Cable Car"
 
 #: trans_presets.java:1254
 msgid "Edit a Cable Car"
-msgstr ""
+msgstr "Edit a Cable Car"
 
 #: trans_presets.java:1258 trans_presets.java:1342
 msgid "Station"
-msgstr ""
+msgstr "Station"
 
 #: trans_presets.java:1259
 msgid "Edit a Station"
-msgstr ""
+msgstr "Edit a Station"
 
 #: trans_presets.java:1267
 msgid "Car"
-msgstr ""
+msgstr "Car"
 
 #: trans_presets.java:1268
 msgid "Fuel"
-msgstr ""
+msgstr "Fuel"
 
 #: trans_presets.java:1269
 msgid "Edit Fuel"
-msgstr ""
+msgstr "Edit Fuel"
 
 #: trans_presets.java:1276
 msgid "Edit Parking"
-msgstr ""
+msgstr "Edit Parking"
 
 #: trans_presets.java:1279
 msgid "Capacity"
-msgstr ""
+msgstr "Capacity"
 
 #: trans_presets.java:1280
 msgid "surface"
-msgstr ""
+msgstr "surface"
 
 #: trans_presets.java:1280
 msgid "multi-storey"
-msgstr ""
+msgstr "multi-storey"
 
 #: trans_presets.java:1280
 msgid "underground"
-msgstr ""
+msgstr "underground"
 
 #: trans_presets.java:1280
 msgid "park_and_ride"
-msgstr ""
+msgstr "park_and_ride"
 
 #: trans_presets.java:1281
 msgid "Spaces for Disabled"
-msgstr ""
+msgstr "Spaces for Disabled"
 
 #: trans_presets.java:1282
 msgid "Fee"
-msgstr ""
+msgstr "Fee"
 
 #: trans_presets.java:1285
 msgid "Wash"
-msgstr ""
+msgstr "Wash"
 
 #: trans_presets.java:1286
 msgid "Edit Car Wash"
-msgstr ""
+msgstr "Edit Car Wash"
 
 #: trans_presets.java:1292 trans_presets.java:1334
 msgid "Shop"
-msgstr ""
+msgstr "Shop"
 
 #: trans_presets.java:1293
 msgid "Edit Car Shop"
-msgstr ""
+msgstr "Edit Car Shop"
 
 #: trans_presets.java:1299
 msgid "Repair"
-msgstr ""
+msgstr "Repair"
 
 #: trans_presets.java:1300
 msgid "Edit Car Repair"
-msgstr ""
+msgstr "Edit Car Repair"
 
 #: trans_presets.java:1306 trans_presets.java:1328
 msgid "Rental"
-msgstr ""
+msgstr "Rental"
 
 #: trans_presets.java:1307
 msgid "Edit Car Rental"
-msgstr ""
+msgstr "Edit Car Rental"
 
 #: trans_presets.java:1313
 msgid "Sharing"
-msgstr ""
+msgstr "Sharing"
 
 #: trans_presets.java:1314
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "Edit Car Sharing"
 
 #: trans_presets.java:1323
 msgid "Edit Bicycle Parking"
-msgstr ""
+msgstr "Edit Bicycle Parking"
 
 #: trans_presets.java:1329
 msgid "Edit Bicycle Rental"
-msgstr ""
+msgstr "Edit Bicycle Rental"
 
 #: trans_presets.java:1335
 msgid "Edit Bicycle Shop"
-msgstr ""
+msgstr "Edit Bicycle Shop"
 
 #: trans_presets.java:1341
 msgid "Public Transport"
-msgstr ""
+msgstr "Public Transport"
 
 #: trans_presets.java:1343
 msgid "Edit Station"
-msgstr ""
+msgstr "Edit Station"
 
 #: trans_presets.java:1350
 msgid "UIC-Reference"
-msgstr ""
+msgstr "UIC-Reference"
 
 #: trans_presets.java:1353
 msgid "Railway Halt"
-msgstr ""
+msgstr "Railway Halt"
 
 #: trans_presets.java:1354
 msgid "Edit Halt"
-msgstr ""
+msgstr "Edit Halt"
 
 #: trans_presets.java:1363
 msgid "Tram Stop"
-msgstr ""
+msgstr "Tram Stop"
 
 #: trans_presets.java:1364
 msgid "Edit Tram Stop"
-msgstr ""
+msgstr "Edit Tram Stop"
 
 #: trans_presets.java:1373
 msgid "Railway Platform"
-msgstr ""
+msgstr "Railway Platform"
 
 #: trans_presets.java:1374
 msgid "Edit a railway platform"
-msgstr ""
+msgstr "Edit a railway platform"
 
 #: trans_presets.java:1377 trans_presets.java:1420
 msgid "Reference (track number)"
-msgstr ""
+msgstr "Reference (track number)"
 
 #: trans_presets.java:1379 trans_presets.java:1422
 msgid "Area"
-msgstr ""
+msgstr "Area"
 
 #: trans_presets.java:1382
 msgid "Subway Entrance"
-msgstr ""
+msgstr "Subway Entrance"
 
 #: trans_presets.java:1383
 msgid "Edit Subway Entrance"
-msgstr ""
+msgstr "Edit Subway Entrance"
 
 #: trans_presets.java:1390
 msgid "Wheelchair"
-msgstr ""
+msgstr "Wheelchair"
 
 #: trans_presets.java:1396
 msgid "Bus Station"
-msgstr ""
+msgstr "Bus Station"
 
 #: trans_presets.java:1397
 msgid "Edit a Bus Station"
-msgstr ""
+msgstr "Edit a Bus Station"
 
 #: trans_presets.java:1405
 msgid "Bus Stop"
-msgstr ""
+msgstr "Bus Stop"
 
 #: trans_presets.java:1406
 msgid "Edit Bus Stop"
-msgstr ""
+msgstr "Edit Bus Stop"
 
 #: trans_presets.java:1416
 msgid "Bus Platform"
-msgstr ""
+msgstr "Bus Platform"
 
 #: trans_presets.java:1417
 msgid "Edit a bus platform"
-msgstr ""
+msgstr "Edit a bus platform"
 
 #: trans_presets.java:1427
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 #: trans_presets.java:1428
 msgid "Edit a Taxi station"
-msgstr ""
+msgstr "Edit a Taxi station"
 
 #: trans_presets.java:1435
 msgid "Airport"
-msgstr ""
+msgstr "Airport"
 
 #: trans_presets.java:1436
 msgid "Edit an airport"
-msgstr ""
+msgstr "Edit an airport"
 
 #: trans_presets.java:1443
 msgid "IATA"
-msgstr ""
+msgstr "IATA"
 
 #: trans_presets.java:1444
 msgid "ICAO"
-msgstr ""
+msgstr "ICAO"
 
 #: trans_presets.java:1452
 msgid "Accomodation"
-msgstr ""
+msgstr "Accomodation"
 
 #: trans_presets.java:1454
 msgid "Edit Hotel"
-msgstr ""
+msgstr "Edit Hotel"
 
 #: trans_presets.java:1457
 msgid "Stars"
-msgstr ""
+msgstr "Stars"
 
 #: trans_presets.java:1460
 msgid "Motel"
-msgstr ""
+msgstr "Motel"
 
 #: trans_presets.java:1461
 msgid "Edit Motel"
-msgstr ""
+msgstr "Edit Motel"
 
 #: trans_presets.java:1466
 msgid "Guest House"
-msgstr ""
+msgstr "Guest House"
 
 #: trans_presets.java:1467
 msgid "Edit Guest House"
-msgstr ""
+msgstr "Edit Guest House"
 
 #: trans_presets.java:1472
 msgid "Chalet"
-msgstr ""
+msgstr "Chalet"
 
 #: trans_presets.java:1473
 msgid "Edit Chalet"
-msgstr ""
+msgstr "Edit Chalet"
 
 #: trans_presets.java:1478
 msgid "Hostel"
-msgstr ""
+msgstr "Hostel"
 
 #: trans_presets.java:1479
 msgid "Edit Hostel"
-msgstr ""
+msgstr "Edit Hostel"
 
 #: trans_presets.java:1484
 msgid "Alpine Hut"
-msgstr ""
+msgstr "Alpine Hut"
 
 #: trans_presets.java:1485
 msgid "Edit Alpine Hut"
-msgstr ""
+msgstr "Edit Alpine Hut"
 
 #: trans_presets.java:1491
 msgid "Caravan Site"
-msgstr ""
+msgstr "Caravan Site"
 
 #: trans_presets.java:1492
 msgid "Edit Caravan Site"
-msgstr ""
+msgstr "Edit Caravan Site"
 
 #: trans_presets.java:1497
 msgid "Camping Site"
-msgstr ""
+msgstr "Camp Site"
 
 #: trans_presets.java:1498
 msgid "Edit Camping Site"
-msgstr ""
+msgstr "Edit Camp Site"
 
 #: trans_presets.java:1506
 msgid "Food+Drinks"
-msgstr ""
+msgstr "Food+Drinks"
 
 #: trans_presets.java:1508
 msgid "Edit Restaurant"
-msgstr ""
+msgstr "Edit Restaurant"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "Cuisine"
-msgstr ""
+msgstr "Cuisine"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "italian"
-msgstr ""
+msgstr "italian"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "chinese"
-msgstr ""
+msgstr "chinese"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "pizza"
-msgstr ""
+msgstr "pizza"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "burger"
-msgstr ""
+msgstr "burger"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "greek"
-msgstr ""
+msgstr "greek"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "german"
-msgstr ""
+msgstr "german"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "indian"
-msgstr ""
+msgstr "indian"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "regional"
-msgstr ""
+msgstr "regional"
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
-msgstr ""
+#, fuzzy
+msgid "kebab"
+msgstr "kebap"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "turkish"
-msgstr ""
+msgstr "turkish"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "asian"
-msgstr ""
+msgstr "asian"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "thai"
-msgstr ""
+msgstr "thai"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "mexican"
-msgstr ""
+msgstr "mexican"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "japanese"
-msgstr ""
+msgstr "japanese"
 
 #: trans_presets.java:1514
 msgid "Fast Food"
-msgstr ""
+msgstr "Fast Food"
 
 #: trans_presets.java:1515
 msgid "Edit Fast Food Restaurant"
-msgstr ""
+msgstr "Edit Fast Food Restaurant"
 
 #: trans_presets.java:1521
 msgid "Cafe"
-msgstr ""
+msgstr "Cafe"
 
 #: trans_presets.java:1522
 msgid "Edit Cafe"
-msgstr ""
+msgstr "Edit Cafe"
 
 #: trans_presets.java:1527
 msgid "Pub"
-msgstr ""
+msgstr "Pub"
 
 #: trans_presets.java:1528
 msgid "Edit Pub"
-msgstr ""
+msgstr "Edit Pub"
 
 #: trans_presets.java:1533
 msgid "Biergarten"
-msgstr ""
+msgstr "Biergarten"
 
 #: trans_presets.java:1534
 msgid "Edit Biergarten"
-msgstr ""
+msgstr "Edit Biergarten"
 
 #: trans_presets.java:1539
 msgid "Nightclub"
-msgstr ""
+msgstr "Nightclub"
 
 #: trans_presets.java:1540
 msgid "Edit Nightclub"
-msgstr ""
+msgstr "Edit Nightclub"
 
 #: trans_presets.java:1546
 msgid "Tourism"
-msgstr ""
+msgstr "Tourism"
 
 #: trans_presets.java:1547
 msgid "Attraction"
-msgstr ""
+msgstr "Attraction"
 
 #: trans_presets.java:1548
 msgid "Edit Attraction"
-msgstr ""
+msgstr "Edit Attraction"
 
 #: trans_presets.java:1553
 msgid "Information point"
-msgstr ""
+msgstr "Information point"
 
 #: trans_presets.java:1554
 msgid "Edit Information Point"
-msgstr ""
+msgstr "Edit Information Point"
 
 #: trans_presets.java:1556
 msgid "office"
-msgstr ""
+msgstr "office"
 
 #: trans_presets.java:1556
 msgid "map"
-msgstr ""
+msgstr "map"
 
 #: trans_presets.java:1556
 msgid "citymap"
-msgstr ""
+msgstr "citymap"
 
 #: trans_presets.java:1556
 msgid "hikingmap"
-msgstr ""
+msgstr "hikingmap"
 
 #: trans_presets.java:1556
 msgid "bicyclemap"
-msgstr ""
+msgstr "bicyclemap"
 
 #: trans_presets.java:1556
 msgid "board"
-msgstr ""
+msgstr "board"
 
 #: trans_presets.java:1556
 msgid "history"
-msgstr ""
+msgstr "history"
 
 #: trans_presets.java:1556
 msgid "nature"
-msgstr ""
+msgstr "nature"
 
 #: trans_presets.java:1556
 msgid "wildlife"
-msgstr ""
+msgstr "wildlife"
 
 #: trans_presets.java:1556
 msgid "guidepost"
-msgstr ""
+msgstr "guidepost"
 
 #: trans_presets.java:1560
 msgid "Museum"
-msgstr ""
+msgstr "Museum"
 
 #: trans_presets.java:1561
 msgid "Edit Museum"
-msgstr ""
+msgstr "Edit Museum"
 
 #: trans_presets.java:1566
 msgid "Zoo"
-msgstr ""
+msgstr "Zoo"
 
 #: trans_presets.java:1567
 msgid "Edit Zoo"
-msgstr ""
+msgstr "Edit Zoo"
 
 #: trans_presets.java:1572
 msgid "Viewpoint"
-msgstr ""
+msgstr "Viewpoint"
 
 #: trans_presets.java:1573
 msgid "Edit Viewpoint"
-msgstr ""
+msgstr "Edit Viewpoint"
 
 #: trans_presets.java:1576
 msgid "Look-Out Tower"
-msgstr ""
+msgstr "Look-Out Tower"
 
 #: trans_presets.java:1579
 msgid "Theme Park"
-msgstr ""
+msgstr "Theme Park"
 
 #: trans_presets.java:1580
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "Edit Theme Park"
 
 #: trans_presets.java:1585
 msgid "Artwork"
-msgstr ""
+msgstr "Artwork"
 
 #: trans_presets.java:1586
 msgid "Edit Artwork"
-msgstr ""
+msgstr "Edit Artwork"
 
 #: trans_presets.java:1593 trans_presets.java:2310
 msgid "Shelter"
-msgstr ""
+msgstr "Shelter"
 
 #: trans_presets.java:1594
 msgid "Edit Shelter"
-msgstr ""
+msgstr "Edit Shelter"
 
 #: trans_presets.java:1597 trans_presets.java:1604
 msgid "Fireplace"
-msgstr ""
+msgstr "Fireplace"
 
 #: trans_presets.java:1600
 msgid "Picnic Site"
-msgstr ""
+msgstr "Picnic Site"
 
 #: trans_presets.java:1601
 msgid "Edit Picnic Site"
-msgstr ""
+msgstr "Edit Picnic Site"
 
 #: trans_presets.java:1609
 msgid "Historic Places"
-msgstr ""
+msgstr "Historic Places"
 
 #: trans_presets.java:1610
 msgid "Castle"
-msgstr ""
+msgstr "Castle"
 
 #: trans_presets.java:1611
 msgid "Edit Castle"
-msgstr ""
+msgstr "Edit Castle"
 
 #: trans_presets.java:1616
 msgid "Ruins"
-msgstr ""
+msgstr "Ruins"
 
 #: trans_presets.java:1617
 msgid "Edit Ruins"
-msgstr ""
+msgstr "Edit Ruins"
 
 #: trans_presets.java:1622
 msgid "Archaeological Site"
-msgstr ""
+msgstr "Archaeological Site"
 
 #: trans_presets.java:1623
 msgid "Edit Archaeological Site"
-msgstr ""
+msgstr "Edit Archaeological Site"
 
 #: trans_presets.java:1628
 msgid "Monument"
-msgstr ""
+msgstr "Monument"
 
 #: trans_presets.java:1629
 msgid "Edit Monument"
-msgstr ""
+msgstr "Edit Monument"
 
 #: trans_presets.java:1634
 msgid "Memorial"
-msgstr ""
+msgstr "Memorial"
 
 #: trans_presets.java:1635
 msgid "Edit Memorial"
-msgstr ""
+msgstr "Edit Memorial"
 
 #: trans_presets.java:1640
 msgid "Battlefield"
-msgstr ""
+msgstr "Battlefield"
 
 #: trans_presets.java:1641
 msgid "Edit Battlefield"
-msgstr ""
+msgstr "Edit Battlefield"
 
 #: trans_presets.java:1646
 msgid "Wayside Cross"
-msgstr ""
+msgstr "Wayside Cross"
 
 #: trans_presets.java:1647
 msgid "Edit a Wayside Cross"
-msgstr ""
+msgstr "Edit a Wayside Cross"
 
 #: trans_presets.java:1652
 msgid "Wayside Shrine"
-msgstr ""
+msgstr "Wayside Shrine"
 
 #: trans_presets.java:1653
 msgid "Edit a Wayside Shrine"
-msgstr ""
+msgstr "Edit a Wayside Shrine"
 
 #: trans_presets.java:1659
 msgid "Leisure"
-msgstr ""
+msgstr "Leisure"
 
 #: trans_presets.java:1660
 msgid "Water Park"
-msgstr ""
+msgstr "Water Park"
 
 #: trans_presets.java:1661
 msgid "Edit Water Park"
-msgstr ""
+msgstr "Edit Water Park"
 
 #: trans_presets.java:1666
 msgid "Playground"
-msgstr ""
+msgstr "Playground"
 
 #: trans_presets.java:1667
 msgid "Edit Playground"
-msgstr ""
+msgstr "Edit Playground"
 
 #: trans_presets.java:1672
 msgid "Fishing"
-msgstr ""
+msgstr "Fishing"
 
 #: trans_presets.java:1673
 msgid "Edit Fishing"
-msgstr ""
+msgstr "Edit Fishing"
 
 #: trans_presets.java:1678
 msgid "Nature Reserve"
-msgstr ""
+msgstr "Nature Reserve"
 
 #: trans_presets.java:1679
 msgid "Edit Nature Reserve"
-msgstr ""
+msgstr "Edit Nature Reserve"
 
 #: trans_presets.java:1684
 msgid "Park"
-msgstr ""
+msgstr "Park"
 
 #: trans_presets.java:1685
 msgid "Edit Park"
-msgstr ""
+msgstr "Edit Park"
 
 #: trans_presets.java:1690
 msgid "Garden"
-msgstr ""
+msgstr "Garden"
 
 #: trans_presets.java:1691
 msgid "Edit Garden"
-msgstr ""
+msgstr "Edit Garden"
 
 #: trans_presets.java:1696
 msgid "Common"
-msgstr ""
+msgstr "Common"
 
 #: trans_presets.java:1697
 msgid "Edit Common"
-msgstr ""
+msgstr "Edit Common"
 
 #: trans_presets.java:1704
 msgid "Sport Facilities"
-msgstr ""
+msgstr "Sport Facilities"
 
 #: trans_presets.java:1705
 msgid "Stadium"
-msgstr ""
+msgstr "Stadium"
 
 #: trans_presets.java:1706
 msgid "Edit Stadium"
-msgstr ""
+msgstr "Edit Stadium"
 
 #: trans_presets.java:1710 trans_presets.java:1720 trans_presets.java:1730
 #: trans_presets.java:1740
 msgid "select sport:"
-msgstr ""
+msgstr "select sport:"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "sport"
-msgstr ""
+msgstr "sport"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "multi"
-msgstr ""
+msgstr "multi"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "archery"
-msgstr ""
+msgstr "archery"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "athletics"
-msgstr ""
+msgstr "athletics"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "australian_football"
-msgstr ""
+msgstr "australian_football"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "baseball"
-msgstr ""
+msgstr "baseball"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "basketball"
-msgstr ""
+msgstr "basketball"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "boules"
-msgstr ""
+msgstr "boules"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "bowls"
-msgstr ""
+msgstr "lawn bowls"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "canoe"
-msgstr ""
+msgstr "canoeing"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "climbing"
-msgstr ""
+msgstr "climbing"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "cricket"
-msgstr ""
+msgstr "cricket"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "cricket_nets"
-msgstr ""
+msgstr "cricket nets"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "croquet"
-msgstr ""
+msgstr "croquet"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "cycling"
-msgstr ""
+msgstr "cycling"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "dog_racing"
-msgstr ""
+msgstr "dog racing"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "equestrian"
-msgstr ""
+msgstr "equestrian"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "football"
-msgstr ""
+msgstr "football"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "golf"
-msgstr ""
+msgstr "golf"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "gymnastics"
-msgstr ""
+msgstr "gymnastics"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "hockey"
-msgstr ""
+msgstr "hockey"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "horse_racing"
-msgstr ""
+msgstr "horse_racing"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "motor"
-msgstr ""
+msgstr "motor"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "pelota"
-msgstr ""
+msgstr "pelota"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "racquet"
-msgstr ""
+msgstr "racquet"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "rugby"
-msgstr ""
+msgstr "rugby"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "shooting"
-msgstr ""
+msgstr "shooting"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "skateboard"
-msgstr ""
+msgstr "skateboard"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "skating"
-msgstr ""
+msgstr "skating"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "skiing"
-msgstr ""
+msgstr "skiing"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "soccer"
-msgstr ""
+msgstr "soccer"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "swimming"
-msgstr ""
+msgstr "swimming"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "table_tennis"
-msgstr ""
+msgstr "table_tennis"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "tennis"
-msgstr ""
+msgstr "tennis"
 
 #: trans_presets.java:1715
 msgid "Sports Centre"
-msgstr ""
+msgstr "Sports Centre"
 
 #: trans_presets.java:1716
 msgid "Edit Sports Centre"
-msgstr ""
+msgstr "Edit Sports Centre"
 
 #: trans_presets.java:1725
 msgid "Pitch"
-msgstr ""
+msgstr "Pitch"
 
 #: trans_presets.java:1726
 msgid "Edit Pitch"
-msgstr ""
+msgstr "Edit Pitch"
 
 #: trans_presets.java:1735
 msgid "Racetrack"
-msgstr ""
+msgstr "Racetrack"
 
 #: trans_presets.java:1736
 msgid "Edit Racetrack"
-msgstr ""
+msgstr "Edit Racetrack"
 
 #: trans_presets.java:1745
 msgid "Golf Course"
-msgstr ""
+msgstr "Golf Course"
 
 #: trans_presets.java:1746
 msgid "Edit Golf Course"
-msgstr ""
+msgstr "Edit Golf Course"
 
 #: trans_presets.java:1751
 msgid "Miniature Golf"
-msgstr ""
+msgstr "Miniature Golf"
 
 #: trans_presets.java:1752
 msgid "Edit Miniature Golf"
-msgstr ""
+msgstr "Edit Miniature Golf"
 
 #: trans_presets.java:1758
 msgid "Sport"
-msgstr ""
+msgstr "Sport"
 
 #: trans_presets.java:1759
 msgid "Multi"
-msgstr ""
+msgstr "Multi"
 
 #: trans_presets.java:1760
 msgid "Edit Multi"
-msgstr ""
+msgstr "Edit Multi"
 
 #: trans_presets.java:1763 trans_presets.java:1770 trans_presets.java:1777
@@ -9171,5 +9329,5 @@
 #: trans_presets.java:1997
 msgid "pitch"
-msgstr ""
+msgstr "pitch"
 
 #: trans_presets.java:1763 trans_presets.java:1770 trans_presets.java:1777
@@ -9186,5 +9344,5 @@
 #: trans_presets.java:1997
 msgid "sports_centre"
-msgstr ""
+msgstr "sports_centre"
 
 #: trans_presets.java:1763 trans_presets.java:1770 trans_presets.java:1777
@@ -9201,1733 +9359,1733 @@
 #: trans_presets.java:1997
 msgid "stadium"
-msgstr ""
+msgstr "stadium"
 
 #: trans_presets.java:1766
 msgid "10pin"
-msgstr ""
+msgstr "10pin"
 
 #: trans_presets.java:1767
 msgid "Edit 10pin"
-msgstr ""
+msgstr "Edit 10pin"
 
 #: trans_presets.java:1773
 msgid "Athletics"
-msgstr ""
+msgstr "Athletics"
 
 #: trans_presets.java:1774
 msgid "Edit Athletics"
-msgstr ""
+msgstr "Edit Athletics"
 
 #: trans_presets.java:1780
 msgid "Archery"
-msgstr ""
+msgstr "Archery"
 
 #: trans_presets.java:1781
 msgid "Edit Archery"
-msgstr ""
+msgstr "Edit Archery"
 
 #: trans_presets.java:1787
 msgid "Climbing"
-msgstr ""
+msgstr "Climbing"
 
 #: trans_presets.java:1788
 msgid "Edit Climbing"
-msgstr ""
+msgstr "Edit Climbing"
 
 #: trans_presets.java:1794
 msgid "Canoeing"
-msgstr ""
+msgstr "Canoeing"
 
 #: trans_presets.java:1795
 msgid "Edit Canoeing"
-msgstr ""
+msgstr "Edit Canoeing"
 
 #: trans_presets.java:1801
 msgid "Cycling"
-msgstr ""
+msgstr "Cycling"
 
 #: trans_presets.java:1802
 msgid "Edit Cycling"
-msgstr ""
+msgstr "Edit Cycling"
 
 #: trans_presets.java:1808
 msgid "Dog Racing"
-msgstr ""
+msgstr "Dog Racing"
 
 #: trans_presets.java:1809
 msgid "Edit Dog Racing"
-msgstr ""
+msgstr "Edit Dog Racing"
 
 #: trans_presets.java:1815
 msgid "Equestrian"
-msgstr ""
+msgstr "Equestrian"
 
 #: trans_presets.java:1816
 msgid "Edit Equestrian"
-msgstr ""
+msgstr "Edit Equestrian"
 
 #: trans_presets.java:1822
 msgid "Horse Racing"
-msgstr ""
+msgstr "Horse Racing"
 
 #: trans_presets.java:1823
 msgid "Edit Horse Racing"
-msgstr ""
+msgstr "Edit Horse Racing"
 
 #: trans_presets.java:1829
 msgid "Gymnastics"
-msgstr ""
+msgstr "Gymnastics"
 
 #: trans_presets.java:1830
 msgid "Edit Gymnastics"
-msgstr ""
+msgstr "Edit Gymnastics"
 
 #: trans_presets.java:1836
 msgid "Motor Sports"
-msgstr ""
+msgstr "Motor Sports"
 
 #: trans_presets.java:1837
 msgid "Edit Motor Sports"
-msgstr ""
+msgstr "Edit Motor Sports"
 
 #: trans_presets.java:1843
 msgid "Skating"
-msgstr ""
+msgstr "Skating"
 
 #: trans_presets.java:1844
 msgid "Edit Skating"
-msgstr ""
+msgstr "Edit Skating"
 
 #: trans_presets.java:1850
 msgid "Skateboard"
-msgstr ""
+msgstr "Skateboard"
 
 #: trans_presets.java:1851
 msgid "Edit Skateboard"
-msgstr ""
+msgstr "Edit Skateboard"
 
 #: trans_presets.java:1857
 msgid "Swimming"
-msgstr ""
+msgstr "Swimming"
 
 #: trans_presets.java:1858
 msgid "Edit Swimming"
-msgstr ""
+msgstr "Edit Swimming"
 
 #: trans_presets.java:1864
 msgid "Skiing"
-msgstr ""
+msgstr "Skiing"
 
 #: trans_presets.java:1865
 msgid "Edit Skiing"
-msgstr ""
+msgstr "Edit Skiing"
 
 #: trans_presets.java:1871
 msgid "Shooting"
-msgstr ""
+msgstr "Shooting"
 
 #: trans_presets.java:1872
 msgid "Edit Shooting"
-msgstr ""
+msgstr "Edit Shooting"
 
 #: trans_presets.java:1880
 msgid "Sport (Ball)"
-msgstr ""
+msgstr "Sport (Ball)"
 
 #: trans_presets.java:1881
 msgid "Soccer"
-msgstr ""
+msgstr "Football"
 
 #: trans_presets.java:1882
 msgid "Edit Soccer"
-msgstr ""
+msgstr "Edit Football"
 
 #: trans_presets.java:1888
 msgid "Football"
-msgstr ""
+msgstr "American Football"
 
 #: trans_presets.java:1889
 msgid "Edit Football"
-msgstr ""
+msgstr "Edit American Football"
 
 #: trans_presets.java:1895
 msgid "Australian Football"
-msgstr ""
+msgstr "Australian Football"
 
 #: trans_presets.java:1896
 msgid "Edit Australian Football"
-msgstr ""
+msgstr "Edit Australian Football"
 
 #: trans_presets.java:1902
 msgid "Baseball"
-msgstr ""
+msgstr "Baseball"
 
 #: trans_presets.java:1903
 msgid "Edit Baseball"
-msgstr ""
+msgstr "Edit Baseball"
 
 #: trans_presets.java:1909
 msgid "Basketball"
-msgstr ""
+msgstr "Basketball"
 
 #: trans_presets.java:1910
 msgid "Edit Basketball"
-msgstr ""
+msgstr "Edit Basketball"
 
 #: trans_presets.java:1916
 msgid "Golf"
-msgstr ""
+msgstr "Golf"
 
 #: trans_presets.java:1917
 msgid "Edit Golf"
-msgstr ""
+msgstr "Edit Golf"
 
 #: trans_presets.java:1920
 msgid "golf_course"
-msgstr ""
+msgstr "golf_course"
 
 #: trans_presets.java:1923
 msgid "Boule"
-msgstr ""
+msgstr "Boule"
 
 #: trans_presets.java:1924
 msgid "Edit Boule"
-msgstr ""
+msgstr "Edit Boule"
 
 #: trans_presets.java:1930
 msgid "Bowls"
-msgstr ""
+msgstr "Bowls"
 
 #: trans_presets.java:1931
 msgid "Edit Bowls"
-msgstr ""
+msgstr "Edit Bowls"
 
 #: trans_presets.java:1937
 msgid "Cricket"
-msgstr ""
+msgstr "Cricket"
 
 #: trans_presets.java:1938
 msgid "Edit Cricket"
-msgstr ""
+msgstr "Edit Cricket"
 
 #: trans_presets.java:1944
 msgid "Cricket Nets"
-msgstr ""
+msgstr "Cricket Nets"
 
 #: trans_presets.java:1945
 msgid "Edit Cricket Nets"
-msgstr ""
+msgstr "Edit Cricket Nets"
 
 #: trans_presets.java:1951
 msgid "Croquet"
-msgstr ""
+msgstr "Croquet"
 
 #: trans_presets.java:1952
 msgid "Edit Croquet"
-msgstr ""
+msgstr "Edit Croquet"
 
 #: trans_presets.java:1958
 msgid "Hockey"
-msgstr ""
+msgstr "Hockey"
 
 #: trans_presets.java:1959
 msgid "Edit Hockey"
-msgstr ""
+msgstr "Edit Hockey"
 
 #: trans_presets.java:1965
 msgid "Pelota"
-msgstr ""
+msgstr "Pelota"
 
 #: trans_presets.java:1966
 msgid "Edit Pelota"
-msgstr ""
+msgstr "Edit Pelota"
 
 #: trans_presets.java:1972
 msgid "Racquet"
-msgstr ""
+msgstr "Racquet"
 
 #: trans_presets.java:1973
 msgid "Edit Racquet"
-msgstr ""
+msgstr "Edit Racquet"
 
 #: trans_presets.java:1979
 msgid "Rugby"
-msgstr ""
+msgstr "Rugby"
 
 #: trans_presets.java:1980
 msgid "Edit Rugby"
-msgstr ""
+msgstr "Edit Rugby"
 
 #: trans_presets.java:1986
 msgid "Table Tennis"
-msgstr ""
+msgstr "Table Tennis"
 
 #: trans_presets.java:1987
 msgid "Edit Table Tennis"
-msgstr ""
+msgstr "Edit Table Tennis"
 
 #: trans_presets.java:1993
 msgid "Tennis"
-msgstr ""
+msgstr "Tennis"
 
 #: trans_presets.java:1994
 msgid "Edit Tennis"
-msgstr ""
+msgstr "Edit Tennis"
 
 #: trans_presets.java:2004
 msgid "Buildings"
-msgstr ""
+msgstr "Buildings"
 
 #: trans_presets.java:2005
 msgid "Building"
-msgstr ""
+msgstr "Building"
 
 #: trans_presets.java:2009
 msgid "Public Building"
-msgstr ""
+msgstr "Public Building"
 
 #: trans_presets.java:2010
 msgid "Edit Public Building"
-msgstr ""
+msgstr "Edit Public Building"
 
 #: trans_presets.java:2015
 msgid "Town hall"
-msgstr ""
+msgstr "Town hall"
 
 #: trans_presets.java:2016
 msgid "Edit Town hall"
-msgstr ""
+msgstr "Edit Town hall"
 
 #: trans_presets.java:2021
 msgid "Embassy"
-msgstr ""
+msgstr "Embassy"
 
 #: trans_presets.java:2022
 msgid "Edit Embassy"
-msgstr ""
+msgstr "Edit Embassy"
 
 #: trans_presets.java:2027
 msgid "Courthouse"
-msgstr ""
+msgstr "Courthouse"
 
 #: trans_presets.java:2028
 msgid "Edit Courthouse"
-msgstr ""
+msgstr "Edit Courthouse"
 
 #: trans_presets.java:2033
 msgid "Prison"
-msgstr ""
+msgstr "Prison"
 
 #: trans_presets.java:2034
 msgid "Edit Prison"
-msgstr ""
+msgstr "Edit Prison"
 
 #: trans_presets.java:2039
 msgid "Police"
-msgstr ""
+msgstr "Police"
 
 #: trans_presets.java:2040
 msgid "Edit Police"
-msgstr ""
+msgstr "Edit Police"
 
 #: trans_presets.java:2045
 msgid "Fire Station"
-msgstr ""
+msgstr "Fire Station"
 
 #: trans_presets.java:2046
 msgid "Edit Fire Station"
-msgstr ""
+msgstr "Edit Fire Station"
 
 #: trans_presets.java:2051
 msgid "Post Office"
-msgstr ""
+msgstr "Post Office"
 
 #: trans_presets.java:2052
 msgid "Edit Post Office"
-msgstr ""
+msgstr "Edit Post Office"
 
 #: trans_presets.java:2059
 msgid "Kindergarten"
-msgstr ""
+msgstr "Preschool"
 
 #: trans_presets.java:2060
 msgid "Edit Kindergarten"
-msgstr ""
+msgstr "Edit Preschool"
 
 #: trans_presets.java:2065
 msgid "School"
-msgstr ""
+msgstr "School"
 
 #: trans_presets.java:2066
 msgid "Edit School"
-msgstr ""
+msgstr "Edit School"
 
 #: trans_presets.java:2071
 msgid "University"
-msgstr ""
+msgstr "University"
 
 #: trans_presets.java:2072
 msgid "Edit University"
-msgstr ""
+msgstr "Edit University"
 
 #: trans_presets.java:2077
 msgid "College"
-msgstr ""
+msgstr "College"
 
 #: trans_presets.java:2078
 msgid "Edit College"
-msgstr ""
+msgstr "Edit College"
 
 #: trans_presets.java:2085
 msgid "Cinema"
-msgstr ""
+msgstr "Cinema"
 
 #: trans_presets.java:2086
 msgid "Edit Cinema"
-msgstr ""
+msgstr "Edit Cinema"
 
 #: trans_presets.java:2091
 msgid "Library"
-msgstr ""
+msgstr "Library"
 
 #: trans_presets.java:2092
 msgid "Edit Library"
-msgstr ""
+msgstr "Edit Library"
 
 #: trans_presets.java:2097
 msgid "Arts Centre"
-msgstr ""
+msgstr "Arts Centre"
 
 #: trans_presets.java:2098
 msgid "Edit Arts Centre"
-msgstr ""
+msgstr "Edit Arts Centre"
 
 #: trans_presets.java:2103
 msgid "Theatre"
-msgstr ""
+msgstr "Theatre"
 
 #: trans_presets.java:2104
 msgid "Edit Theatre"
-msgstr ""
+msgstr "Edit Theatre"
 
 #: trans_presets.java:2109
 msgid "Place of Worship"
-msgstr ""
+msgstr "Place of Worship"
 
 #: trans_presets.java:2110
 msgid "Edit Place of Worship"
-msgstr ""
+msgstr "Edit Place of Worship"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "Religion"
-msgstr ""
+msgstr "Religion"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "bahai"
-msgstr ""
+msgstr "bahai"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "buddhist"
-msgstr ""
+msgstr "buddhist"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "christian"
-msgstr ""
+msgstr "christian"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "hindu"
-msgstr ""
+msgstr "hindu"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "jain"
-msgstr ""
+msgstr "jain"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "jewish"
-msgstr ""
+msgstr "jewish"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "muslim"
-msgstr ""
+msgstr "muslim"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "sikh"
-msgstr ""
+msgstr "sikh"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "spiritualist"
-msgstr ""
+msgstr "spiritualist"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "taoist"
-msgstr ""
+msgstr "taoist"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "unitarianist"
-msgstr ""
+msgstr "unitarianist"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "zoroastrian"
-msgstr ""
+msgstr "zoroastrian"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "Denomination"
-msgstr ""
+msgstr "Denomination"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "anglican"
-msgstr ""
+msgstr "anglican"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "baptist"
-msgstr ""
+msgstr "baptist"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "catholic"
-msgstr ""
+msgstr "catholic"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "evangelical"
-msgstr ""
+msgstr "evangelical"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "jehovahs_witness"
-msgstr ""
+msgstr "jehovahs_witness"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "lutheran"
-msgstr ""
+msgstr "lutheran"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "methodist"
-msgstr ""
+msgstr "methodist"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "mormon"
-msgstr ""
+msgstr "mormon"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "orthodox"
-msgstr ""
+msgstr "orthodox"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "pentecostal"
-msgstr ""
+msgstr "pentecostal"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "presbyterian"
-msgstr ""
+msgstr "presbyterian"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "protestant"
-msgstr ""
+msgstr "protestant"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "quaker"
-msgstr ""
+msgstr "quaker"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "shia"
-msgstr ""
+msgstr "shia"
 
 #: trans_presets.java:2114 trans_presets.java:2611 trans_presets.java:2747
 msgid "sunni"
-msgstr ""
+msgstr "sunni"
 
 #: trans_presets.java:2119
 msgid "Addresses"
-msgstr ""
+msgstr "Addresses"
 
 #: trans_presets.java:2120
 msgid "Edit address information"
-msgstr ""
+msgstr "Edit address information"
 
 #: trans_presets.java:2122
 msgid "House number"
-msgstr ""
+msgstr "House number"
 
 #: trans_presets.java:2126
 msgid "House name"
-msgstr ""
+msgstr "House name"
 
 #: trans_presets.java:2127
 msgid "Street name"
-msgstr ""
+msgstr "Street name"
 
 #: trans_presets.java:2128
 msgid "City name"
-msgstr ""
+msgstr "City name"
 
 #: trans_presets.java:2129
 msgid "Post code"
-msgstr ""
+msgstr "Post code"
 
 #: trans_presets.java:2130
 msgid "Country code"
-msgstr ""
+msgstr "Country code"
 
 #: trans_presets.java:2133
 msgid "Address Interpolation"
-msgstr ""
+msgstr "Address Interpolation"
 
 #: trans_presets.java:2134
 msgid "Edit address interpolation"
-msgstr ""
+msgstr "Edit address interpolation"
 
 #: trans_presets.java:2136
 msgid "Numbering scheme"
-msgstr ""
+msgstr "Numbering scheme"
 
 #: trans_presets.java:2136
 msgid "odd"
-msgstr ""
+msgstr "odd"
 
 #: trans_presets.java:2136
 msgid "even"
-msgstr ""
+msgstr "even"
 
 #: trans_presets.java:2136
 msgid "all"
-msgstr ""
+msgstr "all"
 
 #: trans_presets.java:2141
 msgid "Man Made"
-msgstr ""
+msgstr "Man Made"
 
 #: trans_presets.java:2142
 msgid "Works"
-msgstr ""
+msgstr "Works"
 
 #: trans_presets.java:2143
 msgid "Edit Works"
-msgstr ""
+msgstr "Edit Works"
 
 #: trans_presets.java:2148
 msgid "Tower"
-msgstr ""
+msgstr "Tower"
 
 #: trans_presets.java:2149
 msgid "Edit Tower"
-msgstr ""
+msgstr "Edit Tower"
 
 #: trans_presets.java:2154
 msgid "Water Tower"
-msgstr ""
+msgstr "Water Tower"
 
 #: trans_presets.java:2155
 msgid "Edit Water Tower"
-msgstr ""
+msgstr "Edit Water Tower"
 
 #: trans_presets.java:2160
 msgid "Gasometer"
-msgstr ""
+msgstr "Gasometer"
 
 #: trans_presets.java:2161
 msgid "Edit Gasometer"
-msgstr ""
+msgstr "Edit Gasometer"
 
 #: trans_presets.java:2166
 msgid "Covered Reservoir"
-msgstr ""
+msgstr "Covered Reservoir"
 
 #: trans_presets.java:2167
 msgid "Edit Covered Reservoir"
-msgstr ""
+msgstr "Edit Covered Reservoir"
 
 #: trans_presets.java:2172
 msgid "Lighthouse"
-msgstr ""
+msgstr "Lighthouse"
 
 #: trans_presets.java:2173
 msgid "Edit Lighthouse"
-msgstr ""
+msgstr "Edit Lighthouse"
 
 #: trans_presets.java:2178
 msgid "Windmill"
-msgstr ""
+msgstr "Windmill"
 
 #: trans_presets.java:2179
 msgid "Edit Windmill"
-msgstr ""
+msgstr "Edit Windmill"
 
 #: trans_presets.java:2184
 msgid "Pier"
-msgstr ""
+msgstr "Pier"
 
 #: trans_presets.java:2185
 msgid "Edit Pier"
-msgstr ""
+msgstr "Edit Pier"
 
 #: trans_presets.java:2190
 msgid "Pipeline"
-msgstr ""
+msgstr "Pipeline"
 
 #: trans_presets.java:2191
 msgid "Edit Pipeline"
-msgstr ""
+msgstr "Edit Pipeline"
 
 #: trans_presets.java:2196
 msgid "Wastewater Plant"
-msgstr ""
+msgstr "Sewerage Plant"
 
 #: trans_presets.java:2197
 msgid "Edit Wastewater Plant"
-msgstr ""
+msgstr "Edit Sewerage Plant"
 
 #: trans_presets.java:2202
 msgid "Crane"
-msgstr ""
+msgstr "Crane"
 
 #: trans_presets.java:2203
 msgid "Edit Crane"
-msgstr ""
+msgstr "Edit Crane"
 
 #: trans_presets.java:2208
 msgid "Beacon"
-msgstr ""
+msgstr "Beacon"
 
 #: trans_presets.java:2209
 msgid "Edit Beacon"
-msgstr ""
+msgstr "Edit Beacon"
 
 #: trans_presets.java:2214
 msgid "Survey Point"
-msgstr ""
+msgstr "Survey Point"
 
 #: trans_presets.java:2215
 msgid "Edit Survey Point"
-msgstr ""
+msgstr "Edit Survey Point"
 
 #: trans_presets.java:2220
 msgid "Surveillance"
-msgstr ""
+msgstr "Surveillance"
 
 #: trans_presets.java:2221
 msgid "Edit Surveillance Camera"
-msgstr ""
+msgstr "Edit Surveillance Camera"
 
 #: trans_presets.java:2228
 msgid "Power Generator"
-msgstr ""
+msgstr "Power Generator"
 
 #: trans_presets.java:2229
 msgid "Edit Power Generator"
-msgstr ""
+msgstr "Edit Power Generator"
 
 #: trans_presets.java:2231
 msgid "wind"
-msgstr ""
+msgstr "wind"
 
 #: trans_presets.java:2231
 msgid "hydro"
-msgstr ""
+msgstr "hydro"
 
 #: trans_presets.java:2231
 msgid "fossil"
-msgstr ""
+msgstr "fossil"
 
 #: trans_presets.java:2231
 msgid "nuclear"
-msgstr ""
+msgstr "nuclear"
 
 #: trans_presets.java:2231
 msgid "coal"
-msgstr ""
+msgstr "coal"
 
 #: trans_presets.java:2231
 msgid "photovoltaic"
-msgstr ""
+msgstr "photovoltaic"
 
 #: trans_presets.java:2231
 msgid "gas"
-msgstr ""
+msgstr "gas"
 
 #: trans_presets.java:2235
 msgid "Power Station"
-msgstr ""
+msgstr "Power Station"
 
 #: trans_presets.java:2236
 msgid "Edit power station"
-msgstr ""
+msgstr "Edit power station"
 
 #: trans_presets.java:2241
 msgid "Power Sub Station"
-msgstr ""
+msgstr "Power Sub Station"
 
 #: trans_presets.java:2242
 msgid "Edit power sub station"
-msgstr ""
+msgstr "Edit power sub station"
 
 #: trans_presets.java:2245 trans_presets.java:2257
 msgid "Line reference"
-msgstr ""
+msgstr "Line reference"
 
 #: trans_presets.java:2248
 msgid "Power Tower"
-msgstr ""
+msgstr "Power Tower"
 
 #: trans_presets.java:2249
 msgid "Edit Power Tower"
-msgstr ""
+msgstr "Edit Power Tower"
 
 #: trans_presets.java:2253
 msgid "Power Line"
-msgstr ""
+msgstr "Power Line"
 
 #: trans_presets.java:2254
 msgid "Edit power line"
-msgstr ""
+msgstr "Edit power line"
 
 #: trans_presets.java:2258
 msgid "Voltage"
-msgstr ""
+msgstr "Voltage"
 
 #: trans_presets.java:2259
 msgid "Amount of Wires"
-msgstr ""
+msgstr "Amount of Wires"
 
 #: trans_presets.java:2265
 msgid "Amenities"
-msgstr ""
+msgstr "Amenities"
 
 #: trans_presets.java:2267
 msgid "Toilets"
-msgstr ""
+msgstr "Toilets"
 
 #: trans_presets.java:2270 trans_presets.java:2360
 msgid "Reference number"
-msgstr ""
+msgstr "Reference number"
 
 #: trans_presets.java:2271
 msgid "Charge"
-msgstr ""
+msgstr "Charge"
 
 #: trans_presets.java:2272 trans_presets.java:2361
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: trans_presets.java:2275
 msgid "Post Box"
-msgstr ""
+msgstr "Post Box"
 
 #: trans_presets.java:2280
 msgid "Telephone"
-msgstr ""
+msgstr "Telephone"
 
 #: trans_presets.java:2281
 msgid "Edit a Telephone"
-msgstr ""
+msgstr "Edit a Telephone"
 
 #: trans_presets.java:2284 trans_presets.java:2362
 msgid "Coins"
-msgstr ""
+msgstr "Coins"
 
 #: trans_presets.java:2285 trans_presets.java:2363
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #: trans_presets.java:2286 trans_presets.java:2364
 msgid "Electronic purses and Charge cards"
-msgstr ""
+msgstr "Electronic purses and Charge cards"
 
 #: trans_presets.java:2287 trans_presets.java:2365
 msgid "Debit cards"
-msgstr ""
+msgstr "Debit cards"
 
 #: trans_presets.java:2288 trans_presets.java:2366
 msgid "Credit cards"
-msgstr ""
+msgstr "Credit cards"
 
 #: trans_presets.java:2289
 msgid "Telephone cards"
-msgstr ""
+msgstr "Telephone cards"
 
 #: trans_presets.java:2292
 msgid "Recycling"
-msgstr ""
+msgstr "Recycling"
 
 #: trans_presets.java:2293
 msgid "Edit a Recycling station"
-msgstr ""
+msgstr "Edit a Recycling station"
 
 #: trans_presets.java:2295
 msgid "Batteries"
-msgstr ""
+msgstr "Batteries"
 
 #: trans_presets.java:2296
 msgid "Cans"
-msgstr ""
+msgstr "Cans"
 
 #: trans_presets.java:2297
 msgid "Clothes"
-msgstr ""
+msgstr "Clothes"
 
 #: trans_presets.java:2298
 msgid "Glass"
-msgstr ""
+msgstr "Glass"
 
 #: trans_presets.java:2299
 msgid "Paper"
-msgstr ""
+msgstr "Paper"
 
 #: trans_presets.java:2300
 msgid "Scrap Metal"
-msgstr ""
+msgstr "Scrap Metal"
 
 #: trans_presets.java:2303
 msgid "Bench"
-msgstr ""
+msgstr "Bench"
 
 #: trans_presets.java:2307
 msgid "Hunting Stand"
-msgstr ""
+msgstr "Hunting Stand"
 
 #: trans_presets.java:2308
 msgid "Edit a Hunting Stand"
-msgstr ""
+msgstr "Edit a Hunting Stand"
 
 #: trans_presets.java:2311
 msgid "Hide"
-msgstr ""
+msgstr "Hide"
 
 #: trans_presets.java:2312
 msgid "Lock"
-msgstr ""
+msgstr "Lock"
 
 #: trans_presets.java:2313 trans_presets.java:2790
 msgid "Height"
-msgstr ""
+msgstr "Height"
 
 #: trans_presets.java:2313
 msgid "low"
-msgstr ""
+msgstr "low"
 
 #: trans_presets.java:2313
 msgid "half"
-msgstr ""
+msgstr "half"
 
 #: trans_presets.java:2313
 msgid "full"
-msgstr ""
+msgstr "full"
 
 #: trans_presets.java:2316
 msgid "Fountain"
-msgstr ""
+msgstr "Fountain"
 
 #: trans_presets.java:2317
 msgid "Edit a Fountain"
-msgstr ""
+msgstr "Edit a Fountain"
 
 #: trans_presets.java:2322
 msgid "Drinking Water"
-msgstr ""
+msgstr "Drinking Water"
 
 #: trans_presets.java:2323
 msgid "Edit Drinking Water"
-msgstr ""
+msgstr "Edit Drinking Water"
 
 #: trans_presets.java:2328
 msgid "Baby Hatch"
-msgstr ""
+msgstr "Baby Hatch"
 
 #: trans_presets.java:2329
 msgid "Edit a Baby Hatch"
-msgstr ""
+msgstr "Edit a Baby Hatch"
 
 #: trans_presets.java:2332
 msgid "Opening Hours"
-msgstr ""
+msgstr "Opening Hours"
 
 #: trans_presets.java:2336
 msgid "Shops"
-msgstr ""
+msgstr "Shops"
 
 #: trans_presets.java:2337
 msgid "Supermarket"
-msgstr ""
+msgstr "Supermarket"
 
 #: trans_presets.java:2338
 msgid "Edit Supermarket"
-msgstr ""
+msgstr "Edit Supermarket"
 
 #: trans_presets.java:2343
 msgid "Convenience Store"
-msgstr ""
+msgstr "Convenience Store"
 
 #: trans_presets.java:2344
 msgid "Edit Convenience Store"
-msgstr ""
+msgstr "Edit Convenience Store"
 
 #: trans_presets.java:2349
 msgid "Kiosk"
-msgstr ""
+msgstr "Kiosk"
 
 #: trans_presets.java:2350
 msgid "Edit Kiosk"
-msgstr ""
+msgstr "Edit Kiosk"
 
 #: trans_presets.java:2355
 msgid "Vending machine"
-msgstr ""
+msgstr "Vending machine"
 
 #: trans_presets.java:2356
 msgid "Edit a Vending_machine"
-msgstr ""
+msgstr "Edit a Vending_machine"
 
 #: trans_presets.java:2358
 msgid "Vending products"
-msgstr ""
+msgstr "Vending products"
 
 #: trans_presets.java:2358
 msgid "public_transport_tickets"
-msgstr ""
+msgstr "public_transport_tickets"
 
 #: trans_presets.java:2358
 msgid "public_transport_plans"
-msgstr ""
+msgstr "public_transport_plans"
 
 #: trans_presets.java:2358
 msgid "parking_tickets"
-msgstr ""
+msgstr "parking_tickets"
 
 #: trans_presets.java:2358
 msgid "food"
-msgstr ""
+msgstr "food"
 
 #: trans_presets.java:2358
 msgid "drinks"
-msgstr ""
+msgstr "drinks"
 
 #: trans_presets.java:2358
 msgid "sweets"
-msgstr ""
+msgstr "sweets"
 
 #: trans_presets.java:2358
 msgid "cigarettes"
-msgstr ""
+msgstr "cigarettes"
 
 #: trans_presets.java:2358
 msgid "photos"
-msgstr ""
+msgstr "photos"
 
 #: trans_presets.java:2358
 msgid "animal_food"
-msgstr ""
+msgstr "animal_food"
 
 #: trans_presets.java:2358
 msgid "news_papers"
-msgstr ""
+msgstr "news_papers"
 
 #: trans_presets.java:2358
 msgid "toys"
-msgstr ""
+msgstr "toys"
 
 #: trans_presets.java:2358
 msgid "stamps"
-msgstr ""
+msgstr "stamps"
 
 #: trans_presets.java:2358
 msgid "SIM-cards"
-msgstr ""
+msgstr "SIM-cards"
 
 #: trans_presets.java:2358
 msgid "telephone_vouchers"
-msgstr ""
+msgstr "telephone_vouchers"
 
 #: trans_presets.java:2358
 msgid "vouchers"
-msgstr ""
+msgstr "vouchers"
 
 #: trans_presets.java:2358
 msgid "condoms"
-msgstr ""
+msgstr "condoms"
 
 #: trans_presets.java:2358
 msgid "tampons"
-msgstr ""
+msgstr "tampons"
 
 #: trans_presets.java:2358
 msgid "excrement_bags"
-msgstr ""
+msgstr "excrement_bags"
 
 #: trans_presets.java:2367
 msgid "Account or loyalty cards"
-msgstr ""
+msgstr "Account or loyalty cards"
 
 #: trans_presets.java:2370
 msgid "Butcher"
-msgstr ""
+msgstr "Butcher"
 
 #: trans_presets.java:2371
 msgid "Edit Butcher"
-msgstr ""
+msgstr "Edit Butcher"
 
 #: trans_presets.java:2376
 msgid "Baker"
-msgstr ""
+msgstr "Baker"
 
 #: trans_presets.java:2377
 msgid "Edit Baker"
-msgstr ""
+msgstr "Edit Baker"
 
 #: trans_presets.java:2382
 msgid "Do-it-yourself-store"
-msgstr ""
+msgstr "Do-it-yourself-store"
 
 #: trans_presets.java:2383
 msgid "Edit Do-it-yourself-store"
-msgstr ""
+msgstr "Edit Do-it-yourself-store"
 
 #: trans_presets.java:2388
 msgid "Hairdresser"
-msgstr ""
+msgstr "Hairdresser"
 
 #: trans_presets.java:2389
 msgid "Edit Hairdresser"
-msgstr ""
+msgstr "Edit Hairdresser"
 
 #: trans_presets.java:2394
 msgid "Dry Cleaning"
-msgstr ""
+msgstr "Dry Cleaning"
 
 #: trans_presets.java:2395
 msgid "Edit Dry Cleaning"
-msgstr ""
+msgstr "Edit Dry Cleaning"
 
 #: trans_presets.java:2400
 msgid "Laundry"
-msgstr ""
+msgstr "Laundry"
 
 #: trans_presets.java:2401
 msgid "Edit Laundry"
-msgstr ""
+msgstr "Edit Laundry"
 
 #: trans_presets.java:2406
 msgid "Outdoor"
-msgstr ""
+msgstr "Outdoor"
 
 #: trans_presets.java:2407
 msgid "Edit Outdoor Shop"
-msgstr ""
+msgstr "Edit Outdoor Shop"
 
 #: trans_presets.java:2413
 msgid "Cash"
-msgstr ""
+msgstr "Cash"
 
 #: trans_presets.java:2414
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 #: trans_presets.java:2415
 msgid "Edit Bank"
-msgstr ""
+msgstr "Edit Bank"
 
 #: trans_presets.java:2418 trans_presets.java:2427
 msgid "Automated Teller Machine"
-msgstr ""
+msgstr "Automated Teller Machine"
 
 #: trans_presets.java:2421
 msgid "Money Exchange"
-msgstr ""
+msgstr "Money Exchange"
 
 #: trans_presets.java:2422
 msgid "Edit Money Exchange"
-msgstr ""
+msgstr "Edit Money Exchange"
 
 #: trans_presets.java:2428
 msgid "Edit Automated Teller Machine"
-msgstr ""
+msgstr "Edit Automated Teller Machine"
 
 #: trans_presets.java:2430
 msgid "Provider"
-msgstr ""
+msgstr "Provider"
 
 #: trans_presets.java:2435
 msgid "Health"
-msgstr ""
+msgstr "Health"
 
 #: trans_presets.java:2436
 msgid "Doctors"
-msgstr ""
+msgstr "Doctors"
 
 #: trans_presets.java:2437
 msgid "Edit Doctors"
-msgstr ""
+msgstr "Edit Doctors"
 
 #: trans_presets.java:2442
 msgid "Dentist"
-msgstr ""
+msgstr "Dentist"
 
 #: trans_presets.java:2443
 msgid "Edit Dentist"
-msgstr ""
+msgstr "Edit Dentist"
 
 #: trans_presets.java:2448
 msgid "Pharmacy"
-msgstr ""
+msgstr "Pharmacy"
 
 #: trans_presets.java:2449
 msgid "Edit Pharmacy"
-msgstr ""
+msgstr "Edit Pharmacy"
 
 #: trans_presets.java:2451
 msgid "Dispensing"
-msgstr ""
+msgstr "Dispensing"
 
 #: trans_presets.java:2455
 msgid "Hospital"
-msgstr ""
+msgstr "Hospital"
 
 #: trans_presets.java:2456
 msgid "Edit Hospital"
-msgstr ""
+msgstr "Edit Hospital"
 
 #: trans_presets.java:2461
 msgid "Emergency Access Point"
-msgstr ""
+msgstr "Emergency Access Point"
 
 #: trans_presets.java:2462
 msgid "Edit Emergency Access Point"
-msgstr ""
+msgstr "Edit Emergency Access Point"
 
 #: trans_presets.java:2465
 msgid "Point Number"
-msgstr ""
+msgstr "Point Number"
 
 #: trans_presets.java:2466
 msgid "Phone Number"
-msgstr ""
+msgstr "Phone Number"
 
 #: trans_presets.java:2467
 msgid "(Use international code, like +12-345-67890)"
-msgstr ""
+msgstr "(Use international code, like +12-345-67890)"
 
 #: trans_presets.java:2471
 msgid "Veterinary"
-msgstr ""
+msgstr "Veterinary"
 
 #: trans_presets.java:2472
 msgid "Edit Veterinary"
-msgstr ""
+msgstr "Edit Veterinary"
 
 #: trans_presets.java:2482
 msgid "Continent"
-msgstr ""
+msgstr "Continent"
 
 #: trans_presets.java:2483
 msgid "Edit a Continent"
-msgstr ""
+msgstr "Edit a Continent"
 
 #: trans_presets.java:2489
 msgid "Country"
-msgstr ""
+msgstr "Country"
 
 #: trans_presets.java:2490
 msgid "Edit Country"
-msgstr ""
+msgstr "Edit Country"
 
 #: trans_presets.java:2496
 msgid "State"
-msgstr ""
+msgstr "State"
 
 #: trans_presets.java:2497
 msgid "Edit State"
-msgstr ""
+msgstr "Edit State"
 
 #: trans_presets.java:2503
 msgid "Region"
-msgstr ""
+msgstr "Region"
 
 #: trans_presets.java:2504
 msgid "Edit Region"
-msgstr ""
+msgstr "Edit Region"
 
 #: trans_presets.java:2510
 msgid "County"
-msgstr ""
+msgstr "County"
 
 #: trans_presets.java:2511
 msgid "Edit County"
-msgstr ""
+msgstr "Edit County"
 
 #: trans_presets.java:2517
 msgid "City"
-msgstr ""
+msgstr "City"
 
 #: trans_presets.java:2518
 msgid "Edit City"
-msgstr ""
+msgstr "Edit City"
 
 #: trans_presets.java:2524
 msgid "Town"
-msgstr ""
+msgstr "Town"
 
 #: trans_presets.java:2525
 msgid "Edit Town"
-msgstr ""
+msgstr "Edit Town"
 
 #: trans_presets.java:2531
 msgid "Suburb"
-msgstr ""
+msgstr "Suburb"
 
 #: trans_presets.java:2532
 msgid "Edit Suburb"
-msgstr ""
+msgstr "Edit Suburb"
 
 #: trans_presets.java:2538
 msgid "Village"
-msgstr ""
+msgstr "Village"
 
 #: trans_presets.java:2539
 msgid "Edit Village"
-msgstr ""
+msgstr "Edit Village"
 
 #: trans_presets.java:2545
 msgid "Hamlet"
-msgstr ""
+msgstr "Hamlet"
 
 #: trans_presets.java:2546
 msgid "Edit Hamlet"
-msgstr ""
+msgstr "Edit Hamlet"
 
 #: trans_presets.java:2552
 msgid "Locality"
-msgstr ""
+msgstr "Locality"
 
 #: trans_presets.java:2553
 msgid "Edit Locality"
-msgstr ""
+msgstr "Edit Locality"
 
 #: trans_presets.java:2559
 msgid "Island"
-msgstr ""
+msgstr "Island"
 
 #: trans_presets.java:2560
 msgid "Edit Island"
-msgstr ""
+msgstr "Edit Island"
 
 #: trans_presets.java:2568
 msgid "Boundaries"
-msgstr ""
+msgstr "Boundaries"
 
 #: trans_presets.java:2569
 msgid "National"
-msgstr ""
+msgstr "National"
 
 #: trans_presets.java:2570
 msgid "Edit National Boundary"
-msgstr ""
+msgstr "Edit National Boundary"
 
 #: trans_presets.java:2576
 msgid "Administrative"
-msgstr ""
+msgstr "Administrative"
 
 #: trans_presets.java:2577
 msgid "Edit Administrative Boundary"
-msgstr ""
+msgstr "Edit Administrative Boundary"
 
 #: trans_presets.java:2583
 msgid "Civil"
-msgstr ""
+msgstr "Civil"
 
 #: trans_presets.java:2584
 msgid "Edit Civil Boundary"
-msgstr ""
+msgstr "Edit Civil Boundary"
 
 #: trans_presets.java:2590
 msgid "political"
-msgstr ""
+msgstr "political"
 
 #: trans_presets.java:2591
 msgid "Edit Political Boundary"
-msgstr ""
+msgstr "Edit Political Boundary"
 
 #: trans_presets.java:2597
 msgid "National_park"
-msgstr ""
+msgstr "National_park"
 
 #: trans_presets.java:2598
 msgid "Edit National Park Boundary"
-msgstr ""
+msgstr "Edit National Park Boundary"
 
 #: trans_presets.java:2605
 msgid "Land use"
-msgstr ""
+msgstr "Land use"
 
 #: trans_presets.java:2606
 msgid "Graveyard"
-msgstr ""
+msgstr "Graveyard"
 
 #: trans_presets.java:2607
 msgid "Edit Graveyard"
-msgstr ""
+msgstr "Edit Graveyard"
 
 #: trans_presets.java:2614
 msgid "Farmyard"
-msgstr ""
+msgstr "Farmyard"
 
 #: trans_presets.java:2615
 msgid "Edit Farmyard Landuse"
-msgstr ""
+msgstr "Edit Farmyard Landuse"
 
 #: trans_presets.java:2621
 msgid "Farmland"
-msgstr ""
+msgstr "Farmland"
 
 #: trans_presets.java:2622
 msgid "Edit Farmland Landuse"
-msgstr ""
+msgstr "Edit Farmland Landuse"
 
 #: trans_presets.java:2628
 msgid "Vineyard"
-msgstr ""
+msgstr "Vineyard"
 
 #: trans_presets.java:2629
 msgid "Edit Vineyard Landuse"
-msgstr ""
+msgstr "Edit Vineyard Landuse"
 
 #: trans_presets.java:2635
 msgid "Quarry"
-msgstr ""
+msgstr "Quarry"
 
 #: trans_presets.java:2636
 msgid "Edit Quarry Landuse"
-msgstr ""
+msgstr "Edit Quarry Landuse"
 
 #: trans_presets.java:2642
 msgid "Landfill"
-msgstr ""
+msgstr "Landfill"
 
 #: trans_presets.java:2643
 msgid "Edit Landfill Landuse"
-msgstr ""
+msgstr "Edit Landfill Landuse"
 
 #: trans_presets.java:2649
 msgid "Basin"
-msgstr ""
+msgstr "Basin"
 
 #: trans_presets.java:2650
 msgid "Edit Basin Landuse"
-msgstr ""
+msgstr "Edit Basin Landuse"
 
 #: trans_presets.java:2656
 msgid "Reservoir"
-msgstr ""
+msgstr "Reservoir"
 
 #: trans_presets.java:2657
 msgid "Edit Reservoir Landuse"
-msgstr ""
+msgstr "Edit Reservoir Landuse"
 
 #: trans_presets.java:2663
 msgid "Forest"
-msgstr ""
+msgstr "Forest"
 
 #: trans_presets.java:2664
 msgid "Edit Forest Landuse"
-msgstr ""
+msgstr "Edit Forest Landuse"
 
 #: trans_presets.java:2668 trans_presets.java:2855
 msgid "coniferous"
-msgstr ""
+msgstr "coniferous"
 
 #: trans_presets.java:2668 trans_presets.java:2855
 msgid "deciduous"
-msgstr ""
+msgstr "deciduous"
 
 #: trans_presets.java:2668 trans_presets.java:2855
 msgid "mixed"
-msgstr ""
+msgstr "mixed"
 
 #: trans_presets.java:2671
 msgid "Allotments"
-msgstr ""
+msgstr "Allotments"
 
 #: trans_presets.java:2672
 msgid "Edit Allotments Landuse"
-msgstr ""
+msgstr "Edit Allotments Landuse"
 
 #: trans_presets.java:2678
 msgid "Residential area"
-msgstr ""
+msgstr "Residential area"
 
 #: trans_presets.java:2679
 msgid "Edit Residential Landuse"
-msgstr ""
+msgstr "Edit Residential Landuse"
 
 #: trans_presets.java:2685
 msgid "Retail"
-msgstr ""
+msgstr "Retail"
 
 #: trans_presets.java:2686
 msgid "Edit Retail Landuse"
-msgstr ""
+msgstr "Edit Retail Landuse"
 
 #: trans_presets.java:2692
 msgid "Commercial"
-msgstr ""
+msgstr "Commercial"
 
 #: trans_presets.java:2693
 msgid "Edit Commercial Landuse"
-msgstr ""
+msgstr "Edit Commercial Landuse"
 
 #: trans_presets.java:2699
 msgid "Industrial"
-msgstr ""
+msgstr "Industrial"
 
 #: trans_presets.java:2700
 msgid "Edit Industrial Landuse"
-msgstr ""
+msgstr "Edit Industrial Landuse"
 
 #: trans_presets.java:2706
 msgid "Brownfield"
-msgstr ""
+msgstr "Brownfield"
 
 #: trans_presets.java:2707
 msgid "Edit Brownfield Landuse"
-msgstr ""
+msgstr "Edit Brownfield Landuse"
 
 #: trans_presets.java:2713
 msgid "Greenfield"
-msgstr ""
+msgstr "Greenfield"
 
 #: trans_presets.java:2714
 msgid "Edit Greenfield Landuse"
-msgstr ""
+msgstr "Edit Greenfield Landuse"
 
 #: trans_presets.java:2720
 msgid "Railway land"
-msgstr ""
+msgstr "Railway land"
 
 #: trans_presets.java:2721
 msgid "Edit Railway Landuse"
-msgstr ""
+msgstr "Edit Railway Landuse"
 
 #: trans_presets.java:2727
 msgid "Construction area"
-msgstr ""
+msgstr "Construction area"
 
 #: trans_presets.java:2728
 msgid "Edit Construction Landuse"
-msgstr ""
+msgstr "Edit Construction Landuse"
 
 #: trans_presets.java:2734
 msgid "Military"
-msgstr ""
+msgstr "Military"
 
 #: trans_presets.java:2735
 msgid "Edit Military Landuse"
-msgstr ""
+msgstr "Edit Military Landuse"
 
 #: trans_presets.java:2741
 msgid "Cemetery"
-msgstr ""
+msgstr "Cemetery"
 
 #: trans_presets.java:2742
 msgid "Edit Cemetery Landuse"
-msgstr ""
+msgstr "Edit Cemetery Landuse"
 
 #: trans_presets.java:2750
 msgid "Village Green"
-msgstr ""
+msgstr "Village Green"
 
 #: trans_presets.java:2751
 msgid "Edit Village Green Landuse"
-msgstr ""
+msgstr "Edit Village Green Landuse"
 
 #: trans_presets.java:2757
 msgid "Grass"
-msgstr ""
+msgstr "Grass"
 
 #: trans_presets.java:2758
 msgid "Edit Grass Landuse"
-msgstr ""
+msgstr "Edit Grass Landuse"
 
 #: trans_presets.java:2764
 msgid "Recreation Ground"
-msgstr ""
+msgstr "Recreation Ground"
 
 #: trans_presets.java:2765
 msgid "Edit Recreation Ground Landuse"
-msgstr ""
+msgstr "Edit Recreation Ground Landuse"
 
 #: trans_presets.java:2772
 msgid "Natural"
-msgstr ""
+msgstr "Natural"
 
 #: trans_presets.java:2773
 msgid "Water"
-msgstr ""
+msgstr "Water"
 
 #: trans_presets.java:2774
 msgid "Edit Water"
-msgstr ""
+msgstr "Edit Water"
 
 #: trans_presets.java:2779
 msgid "Land"
-msgstr ""
+msgstr "Land"
 
 #: trans_presets.java:2780
 msgid "Edit Land"
-msgstr ""
+msgstr "Edit Land"
 
 #: trans_presets.java:2785
 msgid "Tree"
-msgstr ""
+msgstr "Tree"
 
 #: trans_presets.java:2786
 msgid "Edit a Tree"
-msgstr ""
+msgstr "Edit a Tree"
 
 #: trans_presets.java:2791
 msgid "Botanical Name"
-msgstr ""
+msgstr "Botanical Name"
 
 #: trans_presets.java:2794
 msgid "Spring"
-msgstr ""
+msgstr "Spring"
 
 #: trans_presets.java:2795
 msgid "Edit a Spring"
-msgstr ""
+msgstr "Edit a Spring"
 
 #: trans_presets.java:2800
 msgid "Cave Entrance"
-msgstr ""
+msgstr "Cave Entrance"
 
 #: trans_presets.java:2801
 msgid "Edit Cave Entrance"
-msgstr ""
+msgstr "Edit Cave Entrance"
 
 #: trans_presets.java:2806
 msgid "Peak"
-msgstr ""
+msgstr "Peak"
 
 #: trans_presets.java:2807
 msgid "Edit Peak"
-msgstr ""
+msgstr "Edit Peak"
 
 #: trans_presets.java:2813
 msgid "Glacier"
-msgstr ""
+msgstr "Glacier"
 
 #: trans_presets.java:2814
 msgid "Edit Glacier"
-msgstr ""
+msgstr "Edit Glacier"
 
 #: trans_presets.java:2820
 msgid "Volcano"
-msgstr ""
+msgstr "Volcano"
 
 #: trans_presets.java:2821
 msgid "Edit Volcano"
-msgstr ""
+msgstr "Edit Volcano"
 
 #: trans_presets.java:2827
 msgid "Scree"
-msgstr ""
+msgstr "Scree"
 
 #: trans_presets.java:2828
 msgid "Edit Scree"
-msgstr ""
+msgstr "Edit Scree"
 
 #: trans_presets.java:2833
 msgid "Scrub"
-msgstr ""
+msgstr "Scrub"
 
 #: trans_presets.java:2834
 msgid "Edit Scrub"
-msgstr ""
+msgstr "Edit Scrub"
 
 #: trans_presets.java:2839
 msgid "Fell"
-msgstr ""
+msgstr "Fell"
 
 #: trans_presets.java:2840
 msgid "Edit Fell"
-msgstr ""
+msgstr "Edit Fell"
 
 #: trans_presets.java:2845
 msgid "Heath"
-msgstr ""
+msgstr "Heath"
 
 #: trans_presets.java:2846
 msgid "Edit Heath"
-msgstr ""
+msgstr "Edit Heath"
 
 #: trans_presets.java:2851
 msgid "Wood"
-msgstr ""
+msgstr "Wood"
 
 #: trans_presets.java:2852
 msgid "Edit Wood"
-msgstr ""
+msgstr "Edit Wood"
 
 #: trans_presets.java:2860
 msgid "Riverbank"
-msgstr ""
+msgstr "Riverbank"
 
 #: trans_presets.java:2861
 msgid "Edit a riverbank"
-msgstr ""
+msgstr "Edit a riverbank"
 
 #: trans_presets.java:2866
 msgid "Coastline"
-msgstr ""
+msgstr "Coastline"
 
 #: trans_presets.java:2867
 msgid "Edit Coastline"
-msgstr ""
+msgstr "Edit Coastline"
 
 #: trans_presets.java:2872
 msgid "Wetland"
-msgstr ""
+msgstr "Wetland"
 
 #: trans_presets.java:2873
 msgid "Edit Wetland"
-msgstr ""
+msgstr "Edit Wetland"
 
 #: trans_presets.java:2876
 msgid "swamp"
-msgstr ""
+msgstr "swamp"
 
 #: trans_presets.java:2876
 msgid "bog"
-msgstr ""
+msgstr "bog"
 
 #: trans_presets.java:2876
 msgid "marsh"
-msgstr ""
+msgstr "marsh"
 
 #: trans_presets.java:2876
 msgid "reedbed"
-msgstr ""
+msgstr "reedbed"
 
 #: trans_presets.java:2876
 msgid "saltmarsh"
-msgstr ""
+msgstr "saltmarsh"
 
 #: trans_presets.java:2876
 msgid "tidalflat"
-msgstr ""
+msgstr "tidalflat"
 
 #: trans_presets.java:2876
 msgid "mangrove"
-msgstr ""
+msgstr "mangrove"
 
 #: trans_presets.java:2879
 msgid "Mud"
-msgstr ""
+msgstr "Mud"
 
 #: trans_presets.java:2880
 msgid "Edit Mud"
-msgstr ""
+msgstr "Edit Mud"
 
 #: trans_presets.java:2885
 msgid "Beach"
-msgstr ""
+msgstr "Beach"
 
 #: trans_presets.java:2886
 msgid "Edit Beach"
-msgstr ""
+msgstr "Edit Beach"
 
 #: trans_presets.java:2891
@@ -10946,2 +11104,5 @@
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Selection: %d way(s) and %d node(s)"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 12692)
+++ applications/editors/josm/i18n/po/es.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 11:57+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 11:09+0000\n"
 "Last-Translator: sergionaranja <sergiosevillano.mail@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -140,6 +140,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Intente actualizar a las últimas versiones de JOSM y de todos los "
@@ -175,11 +175,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Preparando datos..."
@@ -202,36 +201,40 @@
 msgstr "Descargando puntos {0} al {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Encontrado elemento <nd> en una no Vía"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> no tiene ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
-msgstr "Encontrado un parámetro <miembro> fuera de una relación."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
+msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Falta el atributo necesario \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "id del nodo mal formado"
 
@@ -247,5 +250,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Introduzca un breve comentario a los cambios que se están subiendo:"
 
@@ -269,9 +272,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
 msgid "Opening changeset..."
-msgstr ""
+msgstr "Abriendo conjunto de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:223
 msgid "Server does not support changesets"
-msgstr ""
+msgstr "El servidor no soporta conjuntos de cambios"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:245
@@ -302,5 +305,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
 msgid "Incorrect password or username."
-msgstr "Nombre de usuario o contraseña incorrectos"
+msgstr "Contraseña o nombre de usuario incorrectos"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
@@ -394,11 +397,11 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Ignorando url malformada: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "Ignorando URL malformada: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Ignorando archivo url malformado: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "Ignorando archivo URL malformado: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:43
@@ -568,5 +571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -576,5 +579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -585,8 +588,8 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Añadir todos a la selección inicial. Puede ser una cadena de búsqueda al "
-"estilo google o una url que devuelva xml de osm"
+"estilo google o una URL que devuelva xml de osm"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -675,5 +678,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "No se pudo leer la fuente de las preferencias de parámetros: {0}"
+msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:510
@@ -786,5 +789,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -796,5 +799,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -842,5 +845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -860,5 +863,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Rol"
@@ -909,5 +912,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -929,18 +932,18 @@
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Crear nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Editar nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Editar relación #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -953,46 +956,46 @@
 "detecte el tipo de relación y sensible a los límites de sus opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Ocupado por"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiquetas (un valor nulo borra la etiqueta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Añadir seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Añadir todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Borrar la Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Borrar todos los objetos actualmente seleccionados de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Quitar el miembro en la fila de tabla actual de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -1003,33 +1006,33 @@
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 "Resaltar el miembro de la fila de tabla actual como una selección de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Mienbros: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Existieron conflictos durante la importación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Error analizando la respuesta del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1043,5 +1046,5 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "No se puede conectar con el servidor"
@@ -1069,5 +1072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1141,4 +1144,5 @@
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
+"Interruptor de la visiblidad del estado de los marcadores de texto e iconos."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:161
@@ -1163,14 +1167,14 @@
 msgstr "Unir la capa inmediatamente inferior con la capa selecionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Selección Actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Abrir una ventana de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1181,29 +1185,51 @@
 "la lista encima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Haga un zoom a los elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Refrescar la lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Búsqueda por objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Zoom a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Selección: %d vía(s) y %d nodo(s)"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} nodo de vía"
+msgstr[1] "{0} nodos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " (nodo {0})"
+msgstr[1] " (nodos {0})"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relación"
+msgstr[1] "relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Descripción: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1240,5 +1266,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Información"
@@ -1349,5 +1375,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr "Crear un marcador de audio en la cabecera de escucha"
 
@@ -1375,5 +1401,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 msgid "desc"
-msgstr ""
+msgstr "desc"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:102
@@ -1395,5 +1421,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1403,5 +1429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1410,5 +1436,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "No se ha podido crear un marcador de audio nuevo"
 
@@ -2060,9 +2086,9 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATENCIÓN: La contraseña está almacenada en texto plano en el archivo "
 "de preferencias.<br>La clave será transferida en texto plano al servidor, "
-"codificada en la url.<br><b>No usar una contraseña importante.</b></html>"
+"codificada en la URL.<br><b>No usar una contraseña importante.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
@@ -2077,8 +2103,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
-"Las fuentes (url o nombres de archivo) de los archivos de parametrización "
+"Las fuentes (URL o nombres de archivo) de los archivos de parametrización "
 "preestablecida. Ver http://josm.openstreetmap.de/wiki/TaggingPresets (EN) "
 "para ver ayuda."
@@ -2486,5 +2512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:132
 msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr "Solo pistas interesantes de dirección (ej: con parámetro oneway)"
+msgstr "Solo pistas de direcciones de interés (ej: con etiqueta oneway)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
@@ -3133,5 +3159,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "S"
-msgstr ""
+msgstr "S"
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
@@ -3202,9 +3228,9 @@
 msgstr "No se han podido cargar las preferencias desd el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
-msgstr "sin parámetros"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+msgstr "sin etiquetas"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "texto"
@@ -3212,5 +3238,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93
 msgid "untagged way"
-msgstr "vía sin parámetros"
+msgstr "vía sin etiquetas"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -3613,10 +3639,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "El nodo seleccionado no es parte integrante de ninguna vía."
 msgstr[1] "Los nodos seleccionados no son parte integrante de ninguna vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3626,9 +3653,9 @@
 "seleccione la vía también."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Los nodos seleccionados no comparten la misma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3636,10 +3663,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionardos o más nodos para separar una vía circular"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3649,14 +3676,17 @@
 "de la mitad de la vía)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+"Se ha copiado una membresía de relación basada en roles a todas las vías "
+"nuevas.\n"
+"Debe verificar esto y corregirlo donde sea necesario."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
-msgstr ""
+msgstr "Dividir la vía {0} en {1} partes"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:25
@@ -3689,5 +3719,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:77
 msgid "No conflicts to zoom to"
-msgstr ""
+msgstr "No hay conflictos sobre los que acercarse"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
@@ -3707,9 +3737,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
-msgstr ""
+msgstr "Se ha invertido la dirección de todas las vías selccionadas."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
 msgid "Please select at least one way."
-msgstr ""
+msgstr "Por favor seleccione por lo menos una vía."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:62
@@ -3763,5 +3793,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
-msgstr ""
+msgstr "Pegar los contenidos de la memoria de pegado"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
@@ -3789,5 +3819,5 @@
 msgstr "No se pudo leer \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3795,6 +3825,6 @@
 msgstr "Extensión de archivos desconocida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3803,29 +3833,29 @@
 msgstr "Marcadores desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Coordenadas importadas: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Errores de suma de verificación: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Sentencias desconocidas: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+msgstr "Coordenadas cero: "
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "Éxito en la importación NMEA"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "¡Fallo en la importación NMEA!"
@@ -3855,11 +3885,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr "Imposible leer desde la url: \"{0}\""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Imposible leer desde la URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr "Error de análisis sintáctico en url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Error de análisis sintáctico en URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
@@ -3923,35 +3953,35 @@
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "No se ha quitado nada a la selección al buscar \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:167
 #, java-format
 msgid "Found {0} matches"
-msgstr ""
+msgstr "Se han encontrado {0} coincidencias"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "CI"
-msgstr ""
+msgstr "CI"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:223
 msgid "Missing arguments for or."
-msgstr ""
+msgstr "No se encuentran los argumentos de or"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:234
 msgid "Missing argument for not."
-msgstr ""
+msgstr "No se encuentran los argumentos de not"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:245
 msgid "Expected closing parenthesis."
-msgstr ""
+msgstr "Se esperaba un cierre de paréntesis."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -4076,4 +4106,7 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
+"Clique para borrar. Con mayúscula: borrar segmento de vía. Con Alt: no "
+"borrar los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos "
+"referidos."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87
@@ -4198,4 +4231,7 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"Mover objetos arrastrando. Con mayúsculas: añadir a la selección. Con Ctrl: "
+"quitar de la selección. Con mayúsculas y Ctrl: rotar lo seleccionado. O "
+"cambiar la selección."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -4206,9 +4242,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 msgid "Zoom and move map"
-msgstr ""
+msgstr "Alejar/acercar o mover mapa"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4216,5 +4252,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Salir"
@@ -4261,9 +4297,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
 msgid "Orthogonalize shape"
-msgstr ""
+msgstr "Ortogonalizar forma"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
-msgstr ""
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr ""
+"Mover nodos de forma que todos los águlos que se forman sean de 90 o 270 "
+"grados."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -4281,5 +4319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Por favor seleccione vía(s) de por lo menos cuatro nodos."
 
@@ -4326,5 +4364,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
 msgid "Unselect All (Escape)"
-msgstr ""
+msgstr "Deseleccionar todos (Escape)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
@@ -4353,5 +4391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Abrir una URL"
 
@@ -4376,5 +4414,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 msgid "Enter the coordinates for the new node."
-msgstr ""
+msgstr "Introduzca las coordenadas para el nuevo nodo."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
@@ -4430,5 +4468,5 @@
 #, java-format
 msgid "Moves Objects {0}"
-msgstr ""
+msgstr "Mover objetos {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46
@@ -4449,5 +4487,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
 msgid "Copy selected objects to paste buffer."
-msgstr ""
+msgstr "Copia los objetos seleccionados al portapapeles"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:49
@@ -4469,9 +4507,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Ninguno de estos nodos está pegado a ninguna otra cosa."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
@@ -4646,9 +4686,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
 msgid "Paste Tags"
-msgstr ""
+msgstr "Pegar etiquetas"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
+"Aplicar las etiquetas guardadas en la memoria de pegado a todos los "
+"elementos seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
@@ -4711,6 +4753,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "Al revertir esta vía, se sugieren los siguientes cambios en las propiedades "
@@ -4743,5 +4785,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr "No se puede duplicar una vía sin orden."
 
@@ -4824,5 +4866,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Test de etiquetas preestablecidas"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
@@ -4830,4 +4872,6 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
+"Abrir la herramienta de comprobación de etiquetas preestablecidas para "
+"previsualizar los diálogos de etiquetas preestablecidas."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
@@ -5028,4 +5072,8 @@
 msgid "Permitted actions"
 msgstr ""
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5194,5 +5242,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Tag ways as"
-msgstr "Parametrizar vía como"
+msgstr "Etiquetar vías como"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
@@ -5254,5 +5302,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
+msgstr "Etiquetar vías como agua, costa, tierra o nada. Por defecto es agua."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
@@ -5350,5 +5398,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Mostrar fotos sin geoetiquetar"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -5510,9 +5558,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:50
 msgid "Untagged, empty, and one node ways."
-msgstr ""
+msgstr "Vías sin etiquetar, vacías y de nodo único."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:51
 msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
+msgstr "Este test comprueba vías sin etiquetar, vacías y de nodo único."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:76
@@ -5522,5 +5570,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:83
 msgid "Untagged ways"
-msgstr ""
+msgstr "Vías sin etiquetar"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
@@ -5541,4 +5589,5 @@
 "This test checks for ways that contain some of their nodes more than once."
 msgstr ""
+"Este test comprueba vías que contienen algunos de sus nodos más de una vez."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
@@ -5551,4 +5600,6 @@
 "layer, but are not connected by a node."
 msgstr ""
+"Este test comprueba si dos carreteras, vías de tren o vías acuáticas se "
+"cruzan al mismo nivel, sin estar conectadas por algún nodo."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
@@ -5562,5 +5613,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "Comprueba vías con nodos idénticos consecutivos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
@@ -5579,5 +5630,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "Este test comprueba si las costas están correctas."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
@@ -5654,4 +5705,6 @@
 "than one way."
 msgstr ""
+"Este test comprueba si una conexión entre dos nodos no se usa por más de una "
+"vía."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
@@ -5690,4 +5743,5 @@
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
+"Este test comprueba la dirección de vías acuáticas, terrestres y de costa."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
@@ -5710,4 +5764,6 @@
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
+"Este test comprueba si una vía tiene un nodo final demasiado cerca de otra "
+"vía."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:76
@@ -5735,4 +5791,6 @@
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
+"Este test comprueba vías con nombres similares por si pudieran haberse "
+"escrito mal."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
@@ -5751,17 +5809,18 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
 msgid "Untagged nodes."
-msgstr ""
+msgstr "Nodos sin etiquetar"
 
 #: ../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 ""
+"Este test comprueba nodos sin etiquetar que no pertenecen a ninguna vía."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
 msgid "Untagged and unconnected nodes"
-msgstr ""
+msgstr "Nodos sin etiquetar y desconectados"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:134
 msgid "Properties checker :"
-msgstr ""
+msgstr "Comprobación de propiedades:"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:135
@@ -5772,5 +5831,5 @@
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
+msgstr "Línea de test de etiquetas no válida - {0}: {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:224
@@ -5788,5 +5847,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:300
 msgid "Illegal tag/value combinations"
-msgstr ""
+msgstr "Combinacines de etiqueta/valor ilegales"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:311
@@ -5797,5 +5856,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:316
 msgid "Tags with empty values"
-msgstr ""
+msgstr "Etiquetas con valores vacíos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:322
@@ -5842,5 +5901,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:411
 msgid "Validate property values and tags using complex rules."
-msgstr ""
+msgstr "Validar valores de propiedad y etiquetas que usan reglas complejas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
@@ -5848,11 +5907,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "TagChecker source"
-msgstr ""
+msgstr "Fuente de test de etiquetas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
+"Los archivos de datos de las fuentes (URL o nombre de archivo) del corrector "
+"ortográfico (ver http://wiki.openstreetmap.org/index.php/User:JLS/speller) o "
+"del corrector de etiquetas."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:482
@@ -6250,5 +6312,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
@@ -6267,6 +6329,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6337,9 +6399,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
+msgstr "AgPifoJ - Fotos geoetiquetadas"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "Display geotagged photos"
-msgstr ""
+msgstr "Mostrar fotos geoetiquetadas"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
@@ -6425,5 +6487,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr ""
 
@@ -6454,5 +6516,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:539
 msgid "Not yet tagged images"
-msgstr ""
+msgstr "Fotos no etiquetadas todavía"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:558
@@ -6509,5 +6571,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6553,9 +6615,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+msgid "Update Site URL"
+msgstr "URL base del servidor"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr ""
 
@@ -6619,5 +6681,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
 
@@ -6693,5 +6755,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6741,17 +6803,17 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
 msgid "Adjust WMS"
-msgstr ""
+msgstr "Ajustar WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the WMS layer"
-msgstr ""
+msgstr "Ajustar la posición de la capa WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "help"
-msgstr ""
+msgstr "ayuda"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "Help / About"
-msgstr ""
+msgstr "Ayuda / Acerca de..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
@@ -6771,7 +6833,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6784,5 +6846,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
 msgid "WMS Plugin Help"
-msgstr ""
+msgstr "Ayuda del componente WMS"
 
 #: ../plugins/grid/src/grid/GridLayer.java:192
@@ -6792,24 +6854,24 @@
 #: ../plugins/grid/src/grid/GridLayer.java:197
 msgid "Grid rotation"
-msgstr ""
+msgstr "Rotación de la malla"
 
 #: ../plugins/grid/src/grid/GridLayer.java:199
 msgid "World"
-msgstr ""
+msgstr "Mundo"
 
 #: ../plugins/grid/src/grid/GridLayer.java:200
 msgid "Grid layout"
-msgstr ""
+msgstr "Diseño de rejilla"
 
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr ""
+msgstr "Capa de rejilla"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
 msgid "Navigator"
-msgstr ""
+msgstr "Navegador"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6817,41 +6879,41 @@
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
 msgid "Navigation"
-msgstr ""
+msgstr "Navegación"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
 msgid "Reset Graph"
-msgstr ""
+msgstr "Restaurar gráfico"
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
 msgid "Navigate"
-msgstr ""
+msgstr "Navegar"
 
 #: trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #: trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr ""
+msgstr "Open Aerial Map"
 
 #: trans_wms.java:8
 msgid "NPE Maps"
-msgstr ""
+msgstr "NPE Maps"
 
 #: trans_wms.java:13
 msgid "YAHOO (GNOME)"
-msgstr ""
+msgstr "YAHOO (GNOME)"
 
 #: trans_wms.java:14
 msgid "YAHOO (GNOME Fix)"
-msgstr ""
+msgstr "YAHOO (GNOME Fix)"
 
 #: trans_wms.java:15
 msgid "YAHOO (WebKit)"
-msgstr ""
+msgstr "YAHOO (WebKit)"
 
 #: trans_wms.java:16
 msgid "YAHOO (WebKit GTK)"
-msgstr ""
+msgstr "YAHOO (WebKit GTK)"
 
 #: trans_wms.java:18
@@ -6860,23 +6922,23 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
 #: trans_validator.java:38
 msgid "oneway tag on a node"
-msgstr ""
+msgstr "Nodo etiquetado como vía unidireccional"
 
 #: trans_validator.java:39
 msgid "bridge tag on a node"
-msgstr ""
+msgstr "Nodo etiquetado como puente"
 
 #: trans_validator.java:40 trans_validator.java:41 trans_validator.java:42
 #: trans_validator.java:43 trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "Nodo con etiqueta de vía errónea"
 
 #: trans_validator.java:45 trans_validator.java:46
 msgid "highway without a reference"
-msgstr ""
+msgstr "autopista sin referencia"
 
 #: trans_validator.java:47
@@ -6890,9 +6952,9 @@
 #: trans_validator.java:50
 msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "vía ciclista con etiqueta bicicleta"
 
 #: trans_validator.java:51
 msgid "footway with tag foot"
-msgstr ""
+msgstr "vía peatonal con etiqueta a pie"
 
 #: trans_validator.java:54
@@ -6906,9 +6968,9 @@
 #: trans_validator.java:58
 msgid "maxspeed used for footway"
-msgstr ""
+msgstr "velocidad máxima usada en una vía peatonal"
 
 #: trans_validator.java:60
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta capa con el signo +"
 
 #: trans_validator.java:62
@@ -6918,11 +6980,11 @@
 #: trans_validator.java:63
 msgid "abbreviated street name"
-msgstr ""
-
-#: trans_surveyor.java:6
+msgstr "nombre abreviado de la calle"
+
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
-msgstr ""
-
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+msgstr "Boca del túnel"
+
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6935,69 +6997,69 @@
 #: trans_presets.java:586 trans_presets.java:617 trans_presets.java:1203
 msgid "Bridge"
-msgstr ""
-
-#: trans_surveyor.java:16
+msgstr "Puente"
+
+#: trans_surveyor.java:33
 msgid "Village/City"
-msgstr ""
-
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+msgstr "Población/Ciudad"
+
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
-msgstr ""
-
-#: trans_surveyor.java:29
+msgstr "Aparcamiento"
+
+#: trans_surveyor.java:46
 msgid "One Way"
-msgstr ""
-
-#: trans_surveyor.java:33
+msgstr "Único sentido"
+
+#: trans_surveyor.java:50
 msgid "Church"
-msgstr ""
-
-#: trans_surveyor.java:38
+msgstr "Iglesia"
+
+#: trans_surveyor.java:55
 msgid "Fuel Station"
-msgstr ""
-
-#: trans_surveyor.java:43 trans_presets.java:1453
+msgstr "Gasolinera"
+
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
-msgstr ""
-
-#: trans_surveyor.java:47 trans_presets.java:1507
+msgstr "Hotel"
+
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
-msgstr ""
-
-#: trans_surveyor.java:52
+msgstr "Restaurante"
+
+#: trans_surveyor.java:69
 msgid "Shopping"
-msgstr ""
-
-#: trans_surveyor.java:56
+msgstr "Compras"
+
+#: trans_surveyor.java:73
 msgid "WC"
-msgstr ""
-
-#: trans_surveyor.java:60
+msgstr "Baño"
+
+#: trans_surveyor.java:77
 msgid "Camping"
-msgstr ""
-
-#: trans_surveyor.java:72 trans_presets.java:40
+msgstr "Camping"
+
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
-msgstr ""
-
-#: trans_surveyor.java:76 trans_presets.java:115
+msgstr "Autopista"
+
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
-msgstr ""
-
-#: trans_surveyor.java:80 trans_presets.java:151
+msgstr "Carretera primaria"
+
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
-msgstr ""
-
-#: trans_surveyor.java:84 trans_presets.java:188
+msgstr "Carretera secundaria"
+
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
-msgstr ""
-
-#: trans_surveyor.java:88 trans_presets.java:206
+msgstr "Carretera sin identificación propia"
+
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
-msgstr ""
-
-#: trans_surveyor.java:93 trans_surveyor.java:97
+msgstr "Calle urbana"
+
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
-msgstr ""
+msgstr "Prueba"
 
 #: specialmessages.java:6
@@ -7006,8 +7068,10 @@
 "area, or use planet.osm"
 msgstr ""
+"Has solicitado demasiados nodos (>50.000). Descarga un área más pequeña o "
+"usa planet.osm"
 
 #: specialmessages.java:7
 msgid "Database offline for maintenance"
-msgstr ""
+msgstr "La base de datos está fuera de línea por mantenimiento"
 
 #: specialmessages.java:8
@@ -7023,9 +7087,9 @@
 #: trans_presets.java:39
 msgid "Streets"
-msgstr ""
+msgstr "Calles"
 
 #: trans_presets.java:41
 msgid "Edit a Motorway"
-msgstr ""
+msgstr "Editar autopista"
 
 #: trans_presets.java:44 trans_presets.java:80 trans_presets.java:99
@@ -7033,5 +7097,5 @@
 #: trans_presets.java:1442
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #: trans_presets.java:46 trans_presets.java:64 trans_presets.java:82
@@ -7053,5 +7117,5 @@
 #: trans_presets.java:1440 trans_presets.java:2124
 msgid "Optional Attributes:"
-msgstr ""
+msgstr "Atributos opcionales"
 
 #: trans_presets.java:49 trans_presets.java:66 trans_presets.java:85
@@ -7073,5 +7137,5 @@
 #: trans_presets.java:161 trans_presets.java:335
 msgid "Lanes"
-msgstr ""
+msgstr "Carriles"
 
 #: trans_presets.java:51 trans_presets.java:68 trans_presets.java:87
@@ -7083,5 +7147,5 @@
 #: trans_presets.java:623 trans_presets.java:1209
 msgid "Max. speed (km/h)"
-msgstr ""
+msgstr "Velocidad max. (km/h)"
 
 #: trans_presets.java:52 trans_presets.java:69 trans_presets.java:88
@@ -7094,5 +7158,5 @@
 #: trans_presets.java:460 trans_presets.java:616 trans_presets.java:1202
 msgid "Oneway"
-msgstr ""
+msgstr "Único sentido"
 
 #: trans_presets.java:54 trans_presets.java:71 trans_presets.java:90
@@ -7107,5 +7171,5 @@
 #: trans_presets.java:1204
 msgid "Tunnel"
-msgstr ""
+msgstr "Túnel"
 
 #: trans_presets.java:55 trans_presets.java:72 trans_presets.java:91
@@ -7120,5 +7184,5 @@
 #: trans_presets.java:1205
 msgid "Cutting"
-msgstr ""
+msgstr "Desmonte"
 
 #: trans_presets.java:56 trans_presets.java:73 trans_presets.java:92
@@ -7133,57 +7197,57 @@
 #: trans_presets.java:1206
 msgid "Embankment"
-msgstr ""
+msgstr "Terraplén"
 
 #: trans_presets.java:59
 msgid "Motorway Link"
-msgstr ""
+msgstr "Enlace de autopista"
 
 #: trans_presets.java:60
 msgid "Edit a Motorway Link"
-msgstr ""
+msgstr "Editar enlace de autopista"
 
 #: trans_presets.java:76
 msgid "Trunk"
-msgstr ""
+msgstr "Carretera principal"
 
 #: trans_presets.java:77
 msgid "Edit a Trunk"
-msgstr ""
+msgstr "Editar carretera principal"
 
 #: trans_presets.java:95
 msgid "Trunk Link"
-msgstr ""
+msgstr "Enlace a carretera principal"
 
 #: trans_presets.java:96
 msgid "Edit a Trunk Link"
-msgstr ""
+msgstr "Editar enlace a carretera principal"
 
 #: trans_presets.java:116
 msgid "Edit a Primary Road"
-msgstr ""
+msgstr "Editar carretera primaria"
 
 #: trans_presets.java:134
 msgid "Primary Link"
-msgstr ""
+msgstr "Enlace a carretera primaria"
 
 #: trans_presets.java:135
 msgid "Edit a Primary Link"
-msgstr ""
+msgstr "Editar carretera primaria"
 
 #: trans_presets.java:152
 msgid "Edit a Secondary Road"
-msgstr ""
+msgstr "Editar carretera secundaria"
 
 #: trans_presets.java:170
 msgid "Tertiary"
-msgstr ""
+msgstr "Carretera local"
 
 #: trans_presets.java:171
 msgid "Edit a Tertiary Road"
-msgstr ""
+msgstr "Editar"
 
 #: trans_presets.java:189
 msgid "Edit a Unclassified Road"
-msgstr ""
+msgstr "Editar carretera sin identificación propia"
 
 #: trans_presets.java:203 trans_presets.java:221 trans_presets.java:239
@@ -7198,9 +7262,9 @@
 #: trans_presets.java:1378 trans_presets.java:1421
 msgid "Width (metres)"
-msgstr ""
+msgstr "Anchura (en metros)"
 
 #: trans_presets.java:207
 msgid "Edit a Residential Street"
-msgstr ""
+msgstr "Editar calle residencial"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7211,5 +7275,5 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "Surface"
-msgstr ""
+msgstr "Superficie"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7220,5 +7284,5 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "paved"
-msgstr ""
+msgstr "pavimentado"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7227,5 +7291,5 @@
 #: trans_presets.java:466 trans_presets.java:622 trans_presets.java:1208
 msgid "unpaved"
-msgstr ""
+msgstr "sin pavimentar"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7236,53 +7300,53 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "cobblestone"
-msgstr ""
+msgstr "adoquinado"
 
 #: trans_presets.java:224
 msgid "Living Street"
-msgstr ""
+msgstr "Calle residencial"
 
 #: trans_presets.java:225
 msgid "Edit a Living Street"
-msgstr ""
+msgstr "Editar calle residencial"
 
 #: trans_presets.java:242
 msgid "Service"
-msgstr ""
+msgstr "Vía de servicio"
 
 #: trans_presets.java:243
 msgid "Edit a Serviceway"
-msgstr ""
+msgstr "Editar vía de servicio"
 
 #: trans_presets.java:261
 msgid "Parking Aisle"
-msgstr ""
+msgstr "Pasillo de aparcamiento"
 
 #: trans_presets.java:262
 msgid "Edit a Parking Aisle"
-msgstr ""
+msgstr "Editar pasillo de aparcamiento"
 
 #: trans_presets.java:275
 msgid "Road (Unknown Type)"
-msgstr ""
+msgstr "Carretera (tipología desconocida)"
 
 #: trans_presets.java:276
 msgid "Edit a Road of unknown type"
-msgstr ""
+msgstr "Editar carretera (tipología desconocida)"
 
 #: trans_presets.java:296
 msgid "Road Restrictions"
-msgstr ""
+msgstr "Restricciones de tráfico"
 
 #: trans_presets.java:297
 msgid "Edit Road Restrictions"
-msgstr ""
+msgstr "Editar restricciones de tráfico"
 
 #: trans_presets.java:299
 msgid "Toll"
-msgstr ""
+msgstr "Peaje"
 
 #: trans_presets.java:300
 msgid "No exit (cul-de-sac)"
-msgstr ""
+msgstr "Sin salida (cul-de-sac)"
 
 #: trans_presets.java:301 trans_presets.java:487 trans_presets.java:508
@@ -7290,5 +7354,5 @@
 #: trans_presets.java:592
 msgid "Access"
-msgstr ""
+msgstr "Acceso"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7306,5 +7370,5 @@
 #: trans_presets.java:2271 trans_presets.java:2451
 msgid "yes"
-msgstr ""
+msgstr "sí"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7319,5 +7383,5 @@
 #: trans_presets.java:593 trans_presets.java:594
 msgid "private"
-msgstr ""
+msgstr "privado"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7498,9 +7562,9 @@
 #: trans_presets.java:324
 msgid "trunk"
-msgstr ""
+msgstr "Carretera principal"
 
 #: trans_presets.java:324
 msgid "trunk_link"
-msgstr ""
+msgstr "Enlace a carretera principal"
 
 #: trans_presets.java:324
@@ -7932,5 +7996,5 @@
 #: trans_presets.java:864
 msgid "Bus Trap"
-msgstr ""
+msgstr "Trampa de autobús"
 
 #: trans_presets.java:868
@@ -7951,9 +8015,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
-msgstr ""
+msgid "Portcullis"
+msgstr "Rastrillo"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Editar rastrillo"
 
@@ -8623,5 +8687,6 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+#, fuzzy
+msgid "kebab"
 msgstr "kebap"
 
@@ -10860,9 +10925,9 @@
 #: trans_presets.java:2839
 msgid "Fell"
-msgstr "Fell (un tipo de montaña)"
+msgstr "Prado"
 
 #: trans_presets.java:2840
 msgid "Edit Fell"
-msgstr "Editar fell"
+msgstr "Editar pardo"
 
 #: trans_presets.java:2845
@@ -10965,4 +11030,7 @@
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Selección: %d vía(s) y %d nodo(s)"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 12692)
+++ applications/editors/josm/i18n/po/fi.po	(revision 12719)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 12:56+0000\n"
-"Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 06:22+0000\n"
+"Last-Translator: Teemu Koskinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:59+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -136,6 +136,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
@@ -171,11 +171,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Valmistellaan dataa..."
@@ -198,36 +197,40 @@
 msgstr "Ladataan pisteet {0}-{1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Tuntematon versio"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-elementti muussa kuin polussa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "Pisteeltä (<nd>) puuttuu id."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "<member>-tagi muussa kuin relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Vääränlainen pisteen id"
 
@@ -241,5 +244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
@@ -388,11 +391,11 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Jätetään huomioimatta virheellinen url-osoite: ”{0}”"
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr ""
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:43
@@ -495,5 +498,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:155
 msgid "Download area ok, size probably acceptable to server"
-msgstr "Ladattavan alue on sopiva, palvelin todennäköisesti hyväksyy pyynnön"
+msgstr ""
+"Ladattava alue on sopivan kokoinen, palvelin todennäköisesti hyväksyy pyynnön"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
@@ -559,5 +563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -565,5 +569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -572,5 +576,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 
@@ -646,5 +650,5 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:391
@@ -771,5 +775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -781,5 +785,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -825,5 +829,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -843,5 +847,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Rooli"
@@ -892,5 +896,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -912,18 +916,18 @@
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Muokkaa uutta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Muokkaa relaatiota #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -935,46 +939,46 @@
 "ja jäsenien muokkauksen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Tagit (tyhjä kenttä poistaa tagin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Lisää valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Lisää valitut objektit jäseniksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Poista valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Poista kaikki valitut objektit relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -985,32 +989,32 @@
 msgstr "Valitse"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Valitse taulukon aktiivisella rivillä oleva objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Jäsenet: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Tuonnin aikana oli ristiriitoja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Virhe palvelimen vastauksen käsittelyssä."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1024,5 +1028,5 @@
 msgstr "Virhe"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Palvelimeen ei voida yhdistää."
@@ -1050,5 +1054,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1143,14 +1147,14 @@
 msgstr "Yhdistä valittu taso alla olevaan tasoon."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Tämänhetkinen valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Avaa valintaikkuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1159,29 +1163,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Päivitä valintalista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Etsi objekteja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Valinta: %d polku(a) ja %d piste(ttä)"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} reittipiste"
+msgstr[1] "{0} reittipistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} piste)"
+msgstr[1] " ({0} pistettä)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relaatio"
+msgstr[1] "relaatiot"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Kuvaus: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1218,5 +1244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Tietoja"
@@ -1324,5 +1350,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1368,5 +1394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1374,10 +1400,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr ""
 
@@ -1775,5 +1801,5 @@
 msgid_plural "ways"
 msgstr[0] "polku"
-msgstr[1] "polut"
+msgstr[1] "polkua"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
@@ -1812,5 +1838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
 msgid "Could not write bookmark."
-msgstr "Kirjanmerkkejä ei voitu lukea."
+msgstr "Kirjanmerkkiä ei voitu kirjoittaa."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
@@ -2020,8 +2046,8 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista "
-"salausta.<br>Salasana lähetetään salaamattomana palvelimelle url-osoitteessa."
+"salausta.<br>Salasana lähetetään salaamattomana palvelimelle URL-osoitteessa."
 "</br><b>Älä käytä arvokasta salasana.</b></html>"
 
@@ -2037,5 +2063,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -2844,5 +2870,5 @@
 msgid_plural "{0} objects have conflicts:"
 msgstr[0] "{0} objektilla on ristiriita:"
-msgstr[1] "{0}objektilla on ristiriita:"
+msgstr[1] "{0} objektilla on ristiriitoja:"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
@@ -2920,5 +2946,5 @@
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
 msgid "Sequence"
-msgstr "Sekvenssi"
+msgstr "Komentosarja"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
@@ -3106,9 +3132,9 @@
 msgstr "Asetuksia ei voitu ladata palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "ei tageja"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "teksti"
@@ -3395,5 +3421,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
 msgid "Open a preferences page for global settings."
-msgstr "Avaa globaalien asetusten sivu."
+msgstr "Muokkaa JOSM:n asetuksia."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
@@ -3515,10 +3541,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Valittu piste ei ole minkään polun sisällä oleva."
 msgstr[1] "Valitut pisteet eivät ole minkään polun sisällä olevia."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3528,9 +3555,9 @@
 "polku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Valitut pisteet eivät ole samalla polulla."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3538,10 +3565,10 @@
 msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3551,5 +3578,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3557,5 +3584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3691,5 +3718,5 @@
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3697,6 +3724,6 @@
 msgstr "Tuntematon tiedostopääte: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3705,29 +3732,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Tuodut koordinaatit: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Tarkistussummavrihe: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "NMEA-tuonti onnistui"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "NMEA-tuonti epäonnistui"
@@ -3757,10 +3784,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr ""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Ei voitu lukea \"{0}\":aa"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr ""
 
@@ -4106,5 +4133,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4112,5 +4139,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Poistu"
@@ -4159,6 +4186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
-msgstr "Siirrä pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -4176,5 +4203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Valitse vähintään neljästä pisteestä koostuvia suljettuja polkuja."
 
@@ -4234,5 +4261,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
 msgid "Create a circle from three selected nodes."
-msgstr "Luo ympyrä kolmesta valitusta pisteestä."
+msgstr "Luo ympyrän kolmesta valitusta pisteestä."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
@@ -4250,5 +4277,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Avaa URL-osoite."
 
@@ -4359,5 +4386,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46
 msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Monista pisteet, jotka ovat monen polun käytössä."
+msgstr "Monistaa pisteet, jotka ovat monen polun käytössä."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68
@@ -4366,9 +4393,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Mikään näistä pisteistä ei ole yhdistettynä mihinkään muuhun."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Mikään tämän polun pisteistä ei ole käytössä muissa poluissa."
 
@@ -4618,6 +4647,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 
@@ -4648,6 +4677,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
-msgstr ""
+msgid "Can't duplicate unordered way."
+msgstr "Luo kopio polusta"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -4932,4 +4961,8 @@
 msgid "Permitted actions"
 msgstr "Sallitut toiminnot"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr ""
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5159,29 +5192,31 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Mistä suunnasta etsitään maata. Oletus on itä."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Merkitse polut vetenä (water), rantaviivana (coastline) tai ei minään "
+"(nothing). Oletus on vesi (water)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "Käytettävä WMS-taso. Oletus on IR1"
+msgstr "Käytettävä WMS-taso. Oletus on IR1."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "Jokaisen välimuistihakemiston maksimikoko. Oletus on 300 MT"
+msgstr "Jokaisen välimuistihakemiston enimmäiskoko. Oletus on 300 MB."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Välimuistin maksimi-ikä päivissä. Oletus on 100."
+msgstr "Välimuistin enimmäisikä päivissä. Oletus on 100."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "An plugin to trace water bodies on Landsat imagery."
-msgstr "Lisäosa vesimassojen rajaamiseen Landsat-kuvista"
+msgstr "Liitännäinen vesimassojen rajaamiseen Landsat-kuvista."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Lakewalker Plugin Preferences"
-msgstr "Lakevalker-lisäosan asetukset"
+msgstr "Lakevalker-liitännäisen asetukset"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -5216,5 +5251,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:38
 msgid "Load set of images as a new layer."
-msgstr ""
+msgstr "Lataa kuvat uutena tasona."
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
@@ -5259,5 +5294,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Näytä kuvat, joita ei ole geo-merkitty"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -5279,13 +5314,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
 msgid "Validation errors"
-msgstr "Virheet"
+msgstr "Tarkistusvirheet"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 msgid "Open the validation window."
-msgstr ""
+msgstr "Avaa tarkistusikkuna."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
 msgid "Zoom to problem"
-msgstr ""
+msgstr "Zoomaa ongelmaan"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
@@ -5295,5 +5330,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
 msgid "Validate either current selection or complete dataset."
-msgstr ""
+msgstr "Tarkista joko nykyinen valitna tai koko data."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
@@ -5315,9 +5350,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Whole group"
-msgstr ""
+msgstr "Koko ryhmä"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Single elements"
-msgstr ""
+msgstr "Yksittäiset elementit"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
@@ -5327,9 +5362,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
 msgid "Ignore whole group or individual elements?"
-msgstr ""
+msgstr "Ohitetaanko koko ryhmä vai yksittäiset elementit?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
 msgid "Ignoring elements"
-msgstr ""
+msgstr "Ohitetaan elementit"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:161
@@ -5348,5 +5383,5 @@
 #, java-format
 msgid "{0}, ..."
-msgstr ""
+msgstr "{0}, ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
@@ -5356,5 +5391,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "validation error"
-msgstr "virhe"
+msgstr "tarkistusvirhe"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
@@ -5364,5 +5399,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
 msgid "validation warning"
-msgstr "varoitus"
+msgstr "tarkistusvaroitus"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
@@ -5376,5 +5411,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:69
 msgid "Use ignore list."
-msgstr ""
+msgstr "Käytä ohituslistaa."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:70
@@ -5388,5 +5423,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the error layer to display problematic elements."
-msgstr "Käytä virhetasoa ongelmallisten elementtien näyttämiseen"
+msgstr "Käytä virhetasoa ongelmallisten elementtien näyttämiseen."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
@@ -5403,9 +5438,11 @@
 "programs."
 msgstr ""
+"OSM-datantarkistin, joka tarkistaa käyttäjien ja ohjelmien tekemiä yleisiä "
+"virheitä."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:94
 #, java-format
 msgid "Version {0} - Last change at {1}"
-msgstr "Versio {0} - Viimeisin muutos {1}"
+msgstr "Versio {0} - Viimeisin muutos: {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:95
@@ -5419,25 +5456,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:50
 msgid "Untagged, empty, and one node ways."
-msgstr ""
+msgstr "Tagittomat, tyhjät ja yhden pisteen polut."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:51
 msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
+msgstr "Tämä tarkistaa tagittomat, tyhjät ja yhden pisteen polut."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:76
 msgid "Unnamed ways"
-msgstr ""
+msgstr "Nimeämättömät polut"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:83
 msgid "Untagged ways"
-msgstr ""
+msgstr "Tagittomat polut"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Empty ways"
-msgstr ""
+msgstr "Tyhjät polut"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
 msgid "One node ways"
-msgstr ""
+msgstr "Yhden pisteen polut"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
@@ -5450,8 +5487,10 @@
 "This test checks for ways that contain some of their nodes more than once."
 msgstr ""
+"Tämä tarkistaa polut, jotka sisältävät jotkut pisteistänsä useammin kuin "
+"kerran."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
 msgid "Crossing ways."
-msgstr ""
+msgstr "Risteävät polut."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -5460,12 +5499,14 @@
 "layer, but are not connected by a node."
 msgstr ""
+"Tämä tarkistaa, jos kaksi polkua, rautatietä tai vesiväylää risteävät "
+"samassa tasossa, mutteivät ole yhdistettyinä pisteellä."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
 msgid "Crossing ways"
-msgstr ""
+msgstr "Risteävät polut"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
 msgid "Duplicated way nodes."
-msgstr ""
+msgstr "Polkujen pisteiden kaksoiskappaleet."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -5475,5 +5516,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "Polkujen pisteiden kaksoiskappaleet"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
@@ -5488,5 +5529,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr "Tämä testi tarkistaa, että rantaviivat ovat oikein."
+msgstr "Tämä tarkistaa, että rantaviivat ovat oikein."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
@@ -5544,5 +5585,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 msgid "building"
-msgstr ""
+msgstr "rakennus"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
@@ -5761,5 +5802,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6159,5 +6200,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
@@ -6168,16 +6209,20 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
-msgstr ""
+msgstr "Yksinkertaista polku"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr ""
+msgstr "Poistaa turhat pisteet polusta."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
+"Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
+"Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
+"poistamiseen.\n"
+"Oletko varma, että haluat jatkaa?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
@@ -6194,6 +6239,7 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] ""
+msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
 msgstr[1] ""
+"Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6334,6 +6380,6 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
-msgstr ""
+msgid "Open another GPX trace"
+msgstr "Avaa toinen kuva"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
@@ -6418,5 +6464,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6462,10 +6508,10 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr ""
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
-msgstr ""
+msgid "Invalid URL"
+msgstr "Virheellinen päivämäärä"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
@@ -6525,9 +6571,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
 msgid "Rectified Image ..."
-msgstr ""
+msgstr "Suoristettu kuva..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
-msgstr ""
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
+msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
@@ -6602,5 +6648,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6680,7 +6726,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6720,5 +6766,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6769,5 +6815,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -6795,5 +6841,5 @@
 #: trans_validator.java:48
 msgid "misspelled key name"
-msgstr ""
+msgstr "väärinkirjoitettu avain"
 
 #: trans_validator.java:50
@@ -6829,9 +6875,9 @@
 msgstr ""
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr ""
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6844,67 +6890,67 @@
 #: trans_presets.java:586 trans_presets.java:617 trans_presets.java:1203
 msgid "Bridge"
-msgstr ""
-
-#: trans_surveyor.java:16
+msgstr "Silta"
+
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr ""
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr ""
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
-msgstr ""
-
-#: trans_surveyor.java:38
+msgstr "Kirkko"
+
+#: trans_surveyor.java:55
 msgid "Fuel Station"
-msgstr ""
-
-#: trans_surveyor.java:43 trans_presets.java:1453
+msgstr "Huoltoasema"
+
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
-msgstr ""
-
-#: trans_surveyor.java:47 trans_presets.java:1507
+msgstr "Hotelli"
+
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
-msgstr ""
-
-#: trans_surveyor.java:52
+msgstr "Ravintola"
+
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr ""
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
-msgstr ""
-
-#: trans_surveyor.java:60
+msgstr "WC"
+
+#: trans_surveyor.java:77
 msgid "Camping"
-msgstr ""
-
-#: trans_surveyor.java:72 trans_presets.java:40
+msgstr "Leirintäpaikka"
+
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
-msgstr ""
-
-#: trans_surveyor.java:76 trans_presets.java:115
+msgstr "Moottoritie"
+
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr ""
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr ""
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr ""
@@ -6918,5 +6964,5 @@
 #: specialmessages.java:7
 msgid "Database offline for maintenance"
-msgstr ""
+msgstr "Tietokanta ei ole käytössä huoltotoimenpiteiden takia."
 
 #: specialmessages.java:8
@@ -6932,5 +6978,5 @@
 #: trans_presets.java:39
 msgid "Streets"
-msgstr ""
+msgstr "Kadut"
 
 #: trans_presets.java:41
@@ -6976,5 +7022,5 @@
 #: trans_presets.java:1051 trans_presets.java:1059 trans_presets.java:1207
 msgid "Layer"
-msgstr ""
+msgstr "Taso"
 
 #: trans_presets.java:50 trans_presets.java:67 trans_presets.java:86
@@ -6982,5 +7028,5 @@
 #: trans_presets.java:161 trans_presets.java:335
 msgid "Lanes"
-msgstr ""
+msgstr "Kaistat"
 
 #: trans_presets.java:51 trans_presets.java:68 trans_presets.java:87
@@ -6992,5 +7038,5 @@
 #: trans_presets.java:623 trans_presets.java:1209
 msgid "Max. speed (km/h)"
-msgstr ""
+msgstr "Maksiminopeus (km/h)"
 
 #: trans_presets.java:52 trans_presets.java:69 trans_presets.java:88
@@ -7003,5 +7049,5 @@
 #: trans_presets.java:460 trans_presets.java:616 trans_presets.java:1202
 msgid "Oneway"
-msgstr ""
+msgstr "Yksisuuntainen"
 
 #: trans_presets.java:54 trans_presets.java:71 trans_presets.java:90
@@ -7016,5 +7062,5 @@
 #: trans_presets.java:1204
 msgid "Tunnel"
-msgstr ""
+msgstr "Tunneli"
 
 #: trans_presets.java:55 trans_presets.java:72 trans_presets.java:91
@@ -7042,5 +7088,5 @@
 #: trans_presets.java:1206
 msgid "Embankment"
-msgstr ""
+msgstr "Penger"
 
 #: trans_presets.java:59
@@ -7107,5 +7153,5 @@
 #: trans_presets.java:1378 trans_presets.java:1421
 msgid "Width (metres)"
-msgstr ""
+msgstr "Leveys (metreinä)"
 
 #: trans_presets.java:207
@@ -7129,5 +7175,5 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "paved"
-msgstr ""
+msgstr "päällystetty"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7136,5 +7182,5 @@
 #: trans_presets.java:466 trans_presets.java:622 trans_presets.java:1208
 msgid "unpaved"
-msgstr ""
+msgstr "päällystämätön"
 
 #: trans_presets.java:220 trans_presets.java:238 trans_presets.java:256
@@ -7145,9 +7191,9 @@
 #: trans_presets.java:590 trans_presets.java:622 trans_presets.java:1208
 msgid "cobblestone"
-msgstr ""
+msgstr "mukulakivi"
 
 #: trans_presets.java:224
 msgid "Living Street"
-msgstr ""
+msgstr "Pihakatu"
 
 #: trans_presets.java:225
@@ -7193,5 +7239,5 @@
 #: trans_presets.java:300
 msgid "No exit (cul-de-sac)"
-msgstr ""
+msgstr "Umpikuja"
 
 #: trans_presets.java:301 trans_presets.java:487 trans_presets.java:508
@@ -7215,5 +7261,5 @@
 #: trans_presets.java:2271 trans_presets.java:2451
 msgid "yes"
-msgstr ""
+msgstr "kyllä"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7228,5 +7274,5 @@
 #: trans_presets.java:593 trans_presets.java:594
 msgid "private"
-msgstr ""
+msgstr "yksityinen"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7256,5 +7302,5 @@
 #: trans_presets.java:593 trans_presets.java:594
 msgid "destination"
-msgstr ""
+msgstr "määränpää"
 
 #: trans_presets.java:301 trans_presets.java:302 trans_presets.java:303
@@ -7295,5 +7341,5 @@
 #: trans_presets.java:2271 trans_presets.java:2451
 msgid "no"
-msgstr ""
+msgstr "ei"
 
 #: trans_presets.java:302 trans_presets.java:609 trans_presets.java:746
@@ -7304,5 +7350,5 @@
 #: trans_presets.java:1014 trans_presets.java:1321 trans_presets.java:1391
 msgid "Bicycle"
-msgstr ""
+msgstr "Polkypyörä"
 
 #: trans_presets.java:303 trans_presets.java:611 trans_presets.java:745
@@ -7329,5 +7375,5 @@
 #: trans_presets.java:1015
 msgid "Horse"
-msgstr ""
+msgstr "Hevonen"
 
 #: trans_presets.java:307 trans_presets.java:488 trans_presets.java:509
@@ -7339,5 +7385,5 @@
 #: trans_presets.java:1016
 msgid "Motorcycle"
-msgstr ""
+msgstr "Moottoripyörä"
 
 #: trans_presets.java:308 trans_presets.java:489 trans_presets.java:510
@@ -7349,5 +7395,5 @@
 #: trans_presets.java:1017
 msgid "Motorcar"
-msgstr ""
+msgstr "Auto"
 
 #: trans_presets.java:309
@@ -7357,33 +7403,33 @@
 #: trans_presets.java:310
 msgid "Motorboat"
-msgstr ""
+msgstr "Moottorivene"
 
 #: trans_presets.java:311
 msgid "Boat"
-msgstr ""
+msgstr "Vene"
 
 #: trans_presets.java:313
 msgid "Min. speed (km/h)"
-msgstr ""
+msgstr "Miniminopeus (km/h)"
 
 #: trans_presets.java:314 trans_presets.java:349
 msgid "Max. weight (tonnes)"
-msgstr ""
+msgstr "Maksimipaino (tonnia)"
 
 #: trans_presets.java:315
 msgid "Max. Height (metres)"
-msgstr ""
+msgstr "Maksimikorkeus (metriä)"
 
 #: trans_presets.java:316
 msgid "Max. Width (metres)"
-msgstr ""
+msgstr "Maksimileveys (metriä)"
 
 #: trans_presets.java:317
 msgid "Max. Length (metres)"
-msgstr ""
+msgstr "Maksimipituus (metriä)"
 
 #: trans_presets.java:320
 msgid "Roundabout"
-msgstr ""
+msgstr "Kiertoliittymä"
 
 #: trans_presets.java:321
@@ -7395,9 +7441,9 @@
 #: trans_presets.java:2789 trans_presets.java:2855 trans_presets.java:2876
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #: trans_presets.java:324
 msgid "motorway"
-msgstr ""
+msgstr "moottoritie"
 
 #: trans_presets.java:324
@@ -7439,5 +7485,5 @@
 #: trans_presets.java:324
 msgid "living_street"
-msgstr ""
+msgstr "pihakatu"
 
 #: trans_presets.java:324
@@ -7459,5 +7505,5 @@
 #: trans_presets.java:354
 msgid "Ways"
-msgstr ""
+msgstr "Polut"
 
 #: trans_presets.java:355
@@ -7471,13 +7517,13 @@
 #: trans_presets.java:370
 msgid "Junction"
-msgstr ""
+msgstr "Liittymä"
 
 #: trans_presets.java:370
 msgid "roundabout"
-msgstr ""
+msgstr "kiertoliittymä"
 
 #: trans_presets.java:377
 msgid "Bridleway"
-msgstr ""
+msgstr "Ratsastustie"
 
 #: trans_presets.java:378
@@ -7487,5 +7533,5 @@
 #: trans_presets.java:396
 msgid "Cycleway"
-msgstr ""
+msgstr "Pyörätie"
 
 #: trans_presets.java:397
@@ -7495,5 +7541,5 @@
 #: trans_presets.java:415
 msgid "Footway"
-msgstr ""
+msgstr "Jalankulkutie"
 
 #: trans_presets.java:416
@@ -7503,5 +7549,5 @@
 #: trans_presets.java:434
 msgid "Pedestrian"
-msgstr ""
+msgstr "Kävelykatu"
 
 #: trans_presets.java:435
@@ -7511,5 +7557,5 @@
 #: trans_presets.java:452
 msgid "Steps"
-msgstr ""
+msgstr "Portaat"
 
 #: trans_presets.java:453
@@ -7528,5 +7574,5 @@
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "gravel"
-msgstr ""
+msgstr "sora"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
@@ -7538,10 +7584,10 @@
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "grass"
-msgstr ""
+msgstr "ruoho"
 
 #: trans_presets.java:485 trans_presets.java:506 trans_presets.java:527
 #: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
 msgid "sand"
-msgstr ""
+msgstr "hiekka"
 
 #: trans_presets.java:493
@@ -7587,5 +7633,5 @@
 #: trans_presets.java:600
 msgid "Path"
-msgstr ""
+msgstr "Polku"
 
 #: trans_presets.java:601
@@ -7595,5 +7641,5 @@
 #: trans_presets.java:607
 msgid "Snowmobile"
-msgstr ""
+msgstr "Moottorikelkka"
 
 #: trans_presets.java:610
@@ -7655,5 +7701,5 @@
 #: trans_presets.java:702
 msgid "Motorway Junction"
-msgstr ""
+msgstr "Moottoritien liittymä"
 
 #: trans_presets.java:703
@@ -7700,5 +7746,5 @@
 #: trans_presets.java:732
 msgid "Traffic Signal"
-msgstr ""
+msgstr "Liikennevalot"
 
 #: trans_presets.java:736
@@ -7708,5 +7754,5 @@
 #: trans_presets.java:740
 msgid "Zebra Crossing"
-msgstr ""
+msgstr "Suojatie"
 
 #: trans_presets.java:741
@@ -7736,9 +7782,9 @@
 #: trans_presets.java:749
 msgid "Mini Roundabout"
-msgstr ""
+msgstr "Pieni kiertoliittymä"
 
 #: trans_presets.java:753
 msgid "Turning Circle"
-msgstr ""
+msgstr "Kääntöympyrä"
 
 #: trans_presets.java:757
@@ -7760,13 +7806,13 @@
 #: trans_presets.java:770
 msgid "Speed Camera"
-msgstr ""
+msgstr "Nopeuskamera"
 
 #: trans_presets.java:774
 msgid "Emergency Phone"
-msgstr ""
+msgstr "Hätäpuhelin"
 
 #: trans_presets.java:780
 msgid "Ford"
-msgstr ""
+msgstr "Kahluupaikka"
 
 #: trans_presets.java:781
@@ -7789,5 +7835,5 @@
 #: trans_presets.java:804
 msgid "Barriers"
-msgstr ""
+msgstr "Esteet"
 
 #: trans_presets.java:806
@@ -7833,5 +7879,5 @@
 #: trans_presets.java:851
 msgid "Drawbridge"
-msgstr ""
+msgstr "Laskusilta"
 
 #: trans_presets.java:852
@@ -7860,14 +7906,14 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr ""
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
-msgstr ""
+msgid "Edit a Portcullis"
+msgstr "Muokkaa pikanäppäimiä"
 
 #: trans_presets.java:905
 msgid "Gate"
-msgstr ""
+msgstr "Portti"
 
 #: trans_presets.java:906
@@ -7901,9 +7947,9 @@
 #: trans_presets.java:957
 msgid "Hedge"
-msgstr ""
+msgstr "Pensasaita"
 
 #: trans_presets.java:961
 msgid "Fence"
-msgstr ""
+msgstr "Aita"
 
 #: trans_presets.java:965
@@ -7913,9 +7959,9 @@
 #: trans_presets.java:969
 msgid "Wall"
-msgstr ""
+msgstr "Muuri"
 
 #: trans_presets.java:973
 msgid "City Wall"
-msgstr ""
+msgstr "Kaupunginmuuri"
 
 #: trans_presets.java:977
@@ -7953,5 +7999,5 @@
 #: trans_presets.java:1030
 msgid "River"
-msgstr ""
+msgstr "Joki"
 
 #: trans_presets.java:1031
@@ -7961,5 +8007,5 @@
 #: trans_presets.java:1038
 msgid "Canal"
-msgstr ""
+msgstr "Kanava"
 
 #: trans_presets.java:1039
@@ -8001,5 +8047,5 @@
 #: trans_presets.java:1083
 msgid "Dock"
-msgstr ""
+msgstr "Telakka"
 
 #: trans_presets.java:1084
@@ -8009,5 +8055,5 @@
 #: trans_presets.java:1092
 msgid "Dam"
-msgstr ""
+msgstr "Pato"
 
 #: trans_presets.java:1093
@@ -8021,5 +8067,5 @@
 #: trans_presets.java:1101
 msgid "Lock Gate"
-msgstr ""
+msgstr "Sulkuportti"
 
 #: trans_presets.java:1105
@@ -8033,5 +8079,5 @@
 #: trans_presets.java:1112
 msgid "Waterfall"
-msgstr ""
+msgstr "Vesiputous"
 
 #: trans_presets.java:1113
@@ -8045,5 +8091,5 @@
 #: trans_presets.java:1123
 msgid "Marina"
-msgstr ""
+msgstr "Venesatama"
 
 #: trans_presets.java:1124
@@ -8069,9 +8115,9 @@
 #: trans_presets.java:1144
 msgid "Railway"
-msgstr ""
+msgstr "Rautatie"
 
 #: trans_presets.java:1145
 msgid "Rail"
-msgstr ""
+msgstr "Rata"
 
 #: trans_presets.java:1146
@@ -8095,5 +8141,5 @@
 #: trans_presets.java:1191 trans_presets.java:1219
 msgid "siding"
-msgstr ""
+msgstr "sivuraide"
 
 #: trans_presets.java:1149 trans_presets.java:1156 trans_presets.java:1163
@@ -8113,5 +8159,5 @@
 #: trans_presets.java:1159
 msgid "Monorail"
-msgstr ""
+msgstr "Monorail"
 
 #: trans_presets.java:1160
@@ -8121,5 +8167,5 @@
 #: trans_presets.java:1166
 msgid "Preserved"
-msgstr ""
+msgstr "Säilytetty"
 
 #: trans_presets.java:1167
@@ -8129,5 +8175,5 @@
 #: trans_presets.java:1173
 msgid "Light Rail"
-msgstr ""
+msgstr "Pikaraitiotie"
 
 #: trans_presets.java:1174
@@ -8137,5 +8183,5 @@
 #: trans_presets.java:1180
 msgid "Subway"
-msgstr ""
+msgstr "Metro"
 
 #: trans_presets.java:1181
@@ -8145,5 +8191,5 @@
 #: trans_presets.java:1187
 msgid "Tram"
-msgstr ""
+msgstr "Raitiotie"
 
 #: trans_presets.java:1188
@@ -8173,5 +8219,5 @@
 #: trans_presets.java:1228
 msgid "Level Crossing"
-msgstr ""
+msgstr "Tasoristeys"
 
 #: trans_presets.java:1232
@@ -8181,5 +8227,5 @@
 #: trans_presets.java:1236
 msgid "Turntable"
-msgstr ""
+msgstr "Kääntöpöytä"
 
 #: trans_presets.java:1242
@@ -8189,5 +8235,5 @@
 #: trans_presets.java:1243
 msgid "Chair Lift"
-msgstr ""
+msgstr "Tuolihissi"
 
 #: trans_presets.java:1244
@@ -8213,5 +8259,5 @@
 #: trans_presets.java:1258 trans_presets.java:1342
 msgid "Station"
-msgstr ""
+msgstr "Asema"
 
 #: trans_presets.java:1259
@@ -8245,9 +8291,9 @@
 #: trans_presets.java:1280
 msgid "multi-storey"
-msgstr ""
+msgstr "monikerroksinen"
 
 #: trans_presets.java:1280
 msgid "underground"
-msgstr ""
+msgstr "maanalainen"
 
 #: trans_presets.java:1280
@@ -8261,5 +8307,5 @@
 #: trans_presets.java:1282
 msgid "Fee"
-msgstr ""
+msgstr "Maksu"
 
 #: trans_presets.java:1285
@@ -8273,5 +8319,5 @@
 #: trans_presets.java:1292 trans_presets.java:1334
 msgid "Shop"
-msgstr ""
+msgstr "Kauppa"
 
 #: trans_presets.java:1293
@@ -8305,17 +8351,17 @@
 #: trans_presets.java:1323
 msgid "Edit Bicycle Parking"
-msgstr ""
+msgstr "Pyöräteline"
 
 #: trans_presets.java:1329
 msgid "Edit Bicycle Rental"
-msgstr ""
+msgstr "Pyörävuokraamo"
 
 #: trans_presets.java:1335
 msgid "Edit Bicycle Shop"
-msgstr ""
+msgstr "Pyöräkauppa"
 
 #: trans_presets.java:1341
 msgid "Public Transport"
-msgstr ""
+msgstr "Julkinen liikenne"
 
 #: trans_presets.java:1343
@@ -8337,5 +8383,5 @@
 #: trans_presets.java:1363
 msgid "Tram Stop"
-msgstr ""
+msgstr "Raitiovaunupysäkki"
 
 #: trans_presets.java:1364
@@ -8357,5 +8403,5 @@
 #: trans_presets.java:1379 trans_presets.java:1422
 msgid "Area"
-msgstr ""
+msgstr "Alue"
 
 #: trans_presets.java:1382
@@ -8369,9 +8415,9 @@
 #: trans_presets.java:1390
 msgid "Wheelchair"
-msgstr ""
+msgstr "Pyörätuoli"
 
 #: trans_presets.java:1396
 msgid "Bus Station"
-msgstr ""
+msgstr "Bussiasema"
 
 #: trans_presets.java:1397
@@ -8381,5 +8427,5 @@
 #: trans_presets.java:1405
 msgid "Bus Stop"
-msgstr ""
+msgstr "Bussipysäkki"
 
 #: trans_presets.java:1406
@@ -8397,5 +8443,5 @@
 #: trans_presets.java:1427
 msgid "Taxi"
-msgstr ""
+msgstr "Taksi"
 
 #: trans_presets.java:1428
@@ -8405,5 +8451,5 @@
 #: trans_presets.java:1435
 msgid "Airport"
-msgstr ""
+msgstr "Lentokenttä"
 
 #: trans_presets.java:1436
@@ -8413,13 +8459,13 @@
 #: trans_presets.java:1443
 msgid "IATA"
-msgstr ""
+msgstr "IATA"
 
 #: trans_presets.java:1444
 msgid "ICAO"
-msgstr ""
+msgstr "ICAO"
 
 #: trans_presets.java:1452
 msgid "Accomodation"
-msgstr ""
+msgstr "Majoittuminen"
 
 #: trans_presets.java:1454
@@ -8429,9 +8475,9 @@
 #: trans_presets.java:1457
 msgid "Stars"
-msgstr ""
+msgstr "Tähdet"
 
 #: trans_presets.java:1460
 msgid "Motel"
-msgstr ""
+msgstr "Motelli"
 
 #: trans_presets.java:1461
@@ -8449,5 +8495,5 @@
 #: trans_presets.java:1472
 msgid "Chalet"
-msgstr ""
+msgstr "Alppimaja"
 
 #: trans_presets.java:1473
@@ -8457,5 +8503,5 @@
 #: trans_presets.java:1478
 msgid "Hostel"
-msgstr ""
+msgstr "Hostelli"
 
 #: trans_presets.java:1479
@@ -8481,5 +8527,5 @@
 #: trans_presets.java:1497
 msgid "Camping Site"
-msgstr ""
+msgstr "Leirintäalue"
 
 #: trans_presets.java:1498
@@ -8501,61 +8547,61 @@
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "italian"
-msgstr ""
+msgstr "italialainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "chinese"
-msgstr ""
+msgstr "kiinalainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "pizza"
-msgstr ""
+msgstr "pizza"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "burger"
-msgstr ""
+msgstr "hampurilainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "greek"
-msgstr ""
+msgstr "kreikkalainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "german"
-msgstr ""
+msgstr "saksalainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "indian"
-msgstr ""
+msgstr "intialainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "regional"
-msgstr ""
+msgstr "paikallinen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
-msgstr ""
+msgid "kebab"
+msgstr "kebab"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "turkish"
-msgstr ""
+msgstr "turkkilainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "asian"
-msgstr ""
+msgstr "aasialainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "thai"
-msgstr ""
+msgstr "thaimaalainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "mexican"
-msgstr ""
+msgstr "meksikolainen"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "japanese"
-msgstr ""
+msgstr "japanilainen"
 
 #: trans_presets.java:1514
 msgid "Fast Food"
-msgstr ""
+msgstr "Pikaruoka"
 
 #: trans_presets.java:1515
@@ -8565,5 +8611,5 @@
 #: trans_presets.java:1521
 msgid "Cafe"
-msgstr ""
+msgstr "Kahvila"
 
 #: trans_presets.java:1522
@@ -8589,5 +8635,5 @@
 #: trans_presets.java:1539
 msgid "Nightclub"
-msgstr ""
+msgstr "Yökerho"
 
 #: trans_presets.java:1540
@@ -8601,5 +8647,5 @@
 #: trans_presets.java:1547
 msgid "Attraction"
-msgstr ""
+msgstr "Nähtävyys"
 
 #: trans_presets.java:1548
@@ -8621,5 +8667,5 @@
 #: trans_presets.java:1556
 msgid "map"
-msgstr ""
+msgstr "kartta"
 
 #: trans_presets.java:1556
@@ -8633,5 +8679,5 @@
 #: trans_presets.java:1556
 msgid "bicyclemap"
-msgstr ""
+msgstr "pyöräkartta"
 
 #: trans_presets.java:1556
@@ -8657,5 +8703,5 @@
 #: trans_presets.java:1560
 msgid "Museum"
-msgstr ""
+msgstr "Museo"
 
 #: trans_presets.java:1561
@@ -8665,5 +8711,5 @@
 #: trans_presets.java:1566
 msgid "Zoo"
-msgstr ""
+msgstr "Eläintarha"
 
 #: trans_presets.java:1567
@@ -8685,5 +8731,5 @@
 #: trans_presets.java:1579
 msgid "Theme Park"
-msgstr ""
+msgstr "Teemapuisto"
 
 #: trans_presets.java:1580
@@ -8721,9 +8767,9 @@
 #: trans_presets.java:1609
 msgid "Historic Places"
-msgstr ""
+msgstr "Historialliset paikat"
 
 #: trans_presets.java:1610
 msgid "Castle"
-msgstr ""
+msgstr "Linna"
 
 #: trans_presets.java:1611
@@ -8733,5 +8779,5 @@
 #: trans_presets.java:1616
 msgid "Ruins"
-msgstr ""
+msgstr "Rauniot"
 
 #: trans_presets.java:1617
@@ -8741,5 +8787,5 @@
 #: trans_presets.java:1622
 msgid "Archaeological Site"
-msgstr ""
+msgstr "Arkeologinen kaivaus"
 
 #: trans_presets.java:1623
@@ -8749,5 +8795,5 @@
 #: trans_presets.java:1628
 msgid "Monument"
-msgstr ""
+msgstr "Monumentti"
 
 #: trans_presets.java:1629
@@ -8757,5 +8803,5 @@
 #: trans_presets.java:1634
 msgid "Memorial"
-msgstr ""
+msgstr "Muistomerkki"
 
 #: trans_presets.java:1635
@@ -8765,5 +8811,5 @@
 #: trans_presets.java:1640
 msgid "Battlefield"
-msgstr ""
+msgstr "Taistelukenttä"
 
 #: trans_presets.java:1641
@@ -8793,5 +8839,5 @@
 #: trans_presets.java:1660
 msgid "Water Park"
-msgstr ""
+msgstr "Vesipuisto"
 
 #: trans_presets.java:1661
@@ -8801,5 +8847,5 @@
 #: trans_presets.java:1666
 msgid "Playground"
-msgstr ""
+msgstr "Leikkipuisto"
 
 #: trans_presets.java:1667
@@ -8809,5 +8855,5 @@
 #: trans_presets.java:1672
 msgid "Fishing"
-msgstr ""
+msgstr "Kalastus"
 
 #: trans_presets.java:1673
@@ -8817,5 +8863,5 @@
 #: trans_presets.java:1678
 msgid "Nature Reserve"
-msgstr ""
+msgstr "Luonnonsuojelualue"
 
 #: trans_presets.java:1679
@@ -8825,5 +8871,5 @@
 #: trans_presets.java:1684
 msgid "Park"
-msgstr ""
+msgstr "Puisto"
 
 #: trans_presets.java:1685
@@ -8833,5 +8879,5 @@
 #: trans_presets.java:1690
 msgid "Garden"
-msgstr ""
+msgstr "Puutarha"
 
 #: trans_presets.java:1691
@@ -8853,5 +8899,5 @@
 #: trans_presets.java:1705
 msgid "Stadium"
-msgstr ""
+msgstr "Stadion"
 
 #: trans_presets.java:1706
@@ -8877,5 +8923,5 @@
 #: trans_presets.java:1742
 msgid "archery"
-msgstr ""
+msgstr "jousiammunta"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -8887,15 +8933,15 @@
 #: trans_presets.java:1742
 msgid "australian_football"
-msgstr ""
+msgstr "australialainen jalkapallo"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "baseball"
-msgstr ""
+msgstr "baseball"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "basketball"
-msgstr ""
+msgstr "koripallo"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -8917,10 +8963,10 @@
 #: trans_presets.java:1742
 msgid "climbing"
-msgstr ""
+msgstr "kiipeily"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "cricket"
-msgstr ""
+msgstr "kriketti"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -8932,10 +8978,10 @@
 #: trans_presets.java:1742
 msgid "croquet"
-msgstr ""
+msgstr "kroketti"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "cycling"
-msgstr ""
+msgstr "pyöräily"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -8947,25 +8993,25 @@
 #: trans_presets.java:1742
 msgid "equestrian"
-msgstr ""
+msgstr "ratsastus"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "football"
-msgstr ""
+msgstr "amerikkalainen jalkapallo"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "golf"
-msgstr ""
+msgstr "golf"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "gymnastics"
-msgstr ""
+msgstr "voimistelu"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "hockey"
-msgstr ""
+msgstr "jääkiekko"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -8992,10 +9038,10 @@
 #: trans_presets.java:1742
 msgid "rugby"
-msgstr ""
+msgstr "rugby"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "shooting"
-msgstr ""
+msgstr "ammunta"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -9017,20 +9063,20 @@
 #: trans_presets.java:1742
 msgid "soccer"
-msgstr ""
+msgstr "jalkapallo"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "swimming"
-msgstr ""
+msgstr "uinti"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "table_tennis"
-msgstr ""
+msgstr "pöytätennis"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
 #: trans_presets.java:1742
 msgid "tennis"
-msgstr ""
+msgstr "tennis"
 
 #: trans_presets.java:1715
@@ -9060,5 +9106,5 @@
 #: trans_presets.java:1745
 msgid "Golf Course"
-msgstr ""
+msgstr "Golfkenttä"
 
 #: trans_presets.java:1746
@@ -9068,5 +9114,5 @@
 #: trans_presets.java:1751
 msgid "Miniature Golf"
-msgstr ""
+msgstr "Pienoisgolf"
 
 #: trans_presets.java:1752
@@ -9129,5 +9175,5 @@
 #: trans_presets.java:1997
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 #: trans_presets.java:1766
@@ -9149,5 +9195,5 @@
 #: trans_presets.java:1780
 msgid "Archery"
-msgstr ""
+msgstr "Jousiammunta"
 
 #: trans_presets.java:1781
@@ -9157,5 +9203,5 @@
 #: trans_presets.java:1787
 msgid "Climbing"
-msgstr ""
+msgstr "Kiipeily"
 
 #: trans_presets.java:1788
@@ -9173,5 +9219,5 @@
 #: trans_presets.java:1801
 msgid "Cycling"
-msgstr ""
+msgstr "Pyöräily"
 
 #: trans_presets.java:1802
@@ -9189,5 +9235,5 @@
 #: trans_presets.java:1815
 msgid "Equestrian"
-msgstr ""
+msgstr "Ratsastus"
 
 #: trans_presets.java:1816
@@ -9205,5 +9251,5 @@
 #: trans_presets.java:1829
 msgid "Gymnastics"
-msgstr ""
+msgstr "Voimistelu"
 
 #: trans_presets.java:1830
@@ -9213,5 +9259,5 @@
 #: trans_presets.java:1836
 msgid "Motor Sports"
-msgstr ""
+msgstr "Moottoriurheilu"
 
 #: trans_presets.java:1837
@@ -9237,5 +9283,5 @@
 #: trans_presets.java:1857
 msgid "Swimming"
-msgstr ""
+msgstr "Unti"
 
 #: trans_presets.java:1858
@@ -9253,5 +9299,5 @@
 #: trans_presets.java:1871
 msgid "Shooting"
-msgstr ""
+msgstr "Ammunta"
 
 #: trans_presets.java:1872
@@ -9265,5 +9311,5 @@
 #: trans_presets.java:1881
 msgid "Soccer"
-msgstr ""
+msgstr "Jalkapallo"
 
 #: trans_presets.java:1882
@@ -9273,5 +9319,5 @@
 #: trans_presets.java:1888
 msgid "Football"
-msgstr ""
+msgstr "Amerikkalainen jalkapallo"
 
 #: trans_presets.java:1889
@@ -9281,5 +9327,5 @@
 #: trans_presets.java:1895
 msgid "Australian Football"
-msgstr ""
+msgstr "Australialainen jalkapallo"
 
 #: trans_presets.java:1896
@@ -9289,5 +9335,5 @@
 #: trans_presets.java:1902
 msgid "Baseball"
-msgstr ""
+msgstr "Baseball"
 
 #: trans_presets.java:1903
@@ -9297,5 +9343,5 @@
 #: trans_presets.java:1909
 msgid "Basketball"
-msgstr ""
+msgstr "Koripallo"
 
 #: trans_presets.java:1910
@@ -9305,5 +9351,5 @@
 #: trans_presets.java:1916
 msgid "Golf"
-msgstr ""
+msgstr "Golf"
 
 #: trans_presets.java:1917
@@ -9313,5 +9359,5 @@
 #: trans_presets.java:1920
 msgid "golf_course"
-msgstr ""
+msgstr "golfkenttä"
 
 #: trans_presets.java:1923
@@ -9333,5 +9379,5 @@
 #: trans_presets.java:1937
 msgid "Cricket"
-msgstr ""
+msgstr "Kriketti"
 
 #: trans_presets.java:1938
@@ -9349,5 +9395,5 @@
 #: trans_presets.java:1951
 msgid "Croquet"
-msgstr ""
+msgstr "Kroketti"
 
 #: trans_presets.java:1952
@@ -9357,5 +9403,5 @@
 #: trans_presets.java:1958
 msgid "Hockey"
-msgstr ""
+msgstr "Jääkiekko"
 
 #: trans_presets.java:1959
@@ -9381,5 +9427,5 @@
 #: trans_presets.java:1979
 msgid "Rugby"
-msgstr ""
+msgstr "Rugby"
 
 #: trans_presets.java:1980
@@ -9389,5 +9435,5 @@
 #: trans_presets.java:1986
 msgid "Table Tennis"
-msgstr ""
+msgstr "Pöytätennis"
 
 #: trans_presets.java:1987
@@ -9397,5 +9443,5 @@
 #: trans_presets.java:1993
 msgid "Tennis"
-msgstr ""
+msgstr "Tennis"
 
 #: trans_presets.java:1994
@@ -9405,13 +9451,13 @@
 #: trans_presets.java:2004
 msgid "Buildings"
-msgstr ""
+msgstr "Rakennukset"
 
 #: trans_presets.java:2005
 msgid "Building"
-msgstr ""
+msgstr "Rakennus"
 
 #: trans_presets.java:2009
 msgid "Public Building"
-msgstr ""
+msgstr "Julkinen rakennus"
 
 #: trans_presets.java:2010
@@ -9429,5 +9475,5 @@
 #: trans_presets.java:2021
 msgid "Embassy"
-msgstr ""
+msgstr "Suurlähetystö"
 
 #: trans_presets.java:2022
@@ -9437,5 +9483,5 @@
 #: trans_presets.java:2027
 msgid "Courthouse"
-msgstr ""
+msgstr "Oikeustalo"
 
 #: trans_presets.java:2028
@@ -9445,5 +9491,5 @@
 #: trans_presets.java:2033
 msgid "Prison"
-msgstr ""
+msgstr "Vankila"
 
 #: trans_presets.java:2034
@@ -9461,5 +9507,5 @@
 #: trans_presets.java:2045
 msgid "Fire Station"
-msgstr ""
+msgstr "Paloasema"
 
 #: trans_presets.java:2046
@@ -9469,5 +9515,5 @@
 #: trans_presets.java:2051
 msgid "Post Office"
-msgstr ""
+msgstr "Postitoimisto"
 
 #: trans_presets.java:2052
@@ -9477,5 +9523,5 @@
 #: trans_presets.java:2059
 msgid "Kindergarten"
-msgstr ""
+msgstr "Lastentarha"
 
 #: trans_presets.java:2060
@@ -9485,5 +9531,5 @@
 #: trans_presets.java:2065
 msgid "School"
-msgstr ""
+msgstr "Koulu"
 
 #: trans_presets.java:2066
@@ -9493,5 +9539,5 @@
 #: trans_presets.java:2071
 msgid "University"
-msgstr ""
+msgstr "Yliopisto"
 
 #: trans_presets.java:2072
@@ -9501,5 +9547,5 @@
 #: trans_presets.java:2077
 msgid "College"
-msgstr ""
+msgstr "Korkeakoulu"
 
 #: trans_presets.java:2078
@@ -9509,5 +9555,5 @@
 #: trans_presets.java:2085
 msgid "Cinema"
-msgstr ""
+msgstr "Elokuvateatteri"
 
 #: trans_presets.java:2086
@@ -9517,5 +9563,5 @@
 #: trans_presets.java:2091
 msgid "Library"
-msgstr ""
+msgstr "Kirjasto"
 
 #: trans_presets.java:2092
@@ -9533,5 +9579,5 @@
 #: trans_presets.java:2103
 msgid "Theatre"
-msgstr ""
+msgstr "Teatteri"
 
 #: trans_presets.java:2104
@@ -9549,5 +9595,5 @@
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
 msgid "Religion"
-msgstr ""
+msgstr "Uskonto"
 
 #: trans_presets.java:2113 trans_presets.java:2610 trans_presets.java:2746
@@ -9681,17 +9727,17 @@
 #: trans_presets.java:2127
 msgid "Street name"
-msgstr ""
+msgstr "Kadunnimi"
 
 #: trans_presets.java:2128
 msgid "City name"
-msgstr ""
+msgstr "Kaupungin nimi"
 
 #: trans_presets.java:2129
 msgid "Post code"
-msgstr ""
+msgstr "Postinumero"
 
 #: trans_presets.java:2130
 msgid "Country code"
-msgstr ""
+msgstr "Maakoodi"
 
 #: trans_presets.java:2133
@@ -9709,13 +9755,13 @@
 #: trans_presets.java:2136
 msgid "odd"
-msgstr ""
+msgstr "pariton"
 
 #: trans_presets.java:2136
 msgid "even"
-msgstr ""
+msgstr "parillinen"
 
 #: trans_presets.java:2136
 msgid "all"
-msgstr ""
+msgstr "kaikki"
 
 #: trans_presets.java:2141
@@ -9733,5 +9779,5 @@
 #: trans_presets.java:2148
 msgid "Tower"
-msgstr ""
+msgstr "Torni"
 
 #: trans_presets.java:2149
@@ -9741,5 +9787,5 @@
 #: trans_presets.java:2154
 msgid "Water Tower"
-msgstr ""
+msgstr "Vesitorni"
 
 #: trans_presets.java:2155
@@ -9749,5 +9795,5 @@
 #: trans_presets.java:2160
 msgid "Gasometer"
-msgstr ""
+msgstr "Kaasukello"
 
 #: trans_presets.java:2161
@@ -9765,5 +9811,5 @@
 #: trans_presets.java:2172
 msgid "Lighthouse"
-msgstr ""
+msgstr "Majakka"
 
 #: trans_presets.java:2173
@@ -9773,5 +9819,5 @@
 #: trans_presets.java:2178
 msgid "Windmill"
-msgstr ""
+msgstr "Tuulimylly"
 
 #: trans_presets.java:2179
@@ -9781,5 +9827,5 @@
 #: trans_presets.java:2184
 msgid "Pier"
-msgstr ""
+msgstr "Laituri"
 
 #: trans_presets.java:2185
@@ -9805,5 +9851,5 @@
 #: trans_presets.java:2202
 msgid "Crane"
-msgstr ""
+msgstr "Nosturi"
 
 #: trans_presets.java:2203
@@ -9813,5 +9859,5 @@
 #: trans_presets.java:2208
 msgid "Beacon"
-msgstr ""
+msgstr "Loisto"
 
 #: trans_presets.java:2209
@@ -9845,21 +9891,21 @@
 #: trans_presets.java:2231
 msgid "wind"
-msgstr ""
+msgstr "tuuli"
 
 #: trans_presets.java:2231
 msgid "hydro"
-msgstr ""
+msgstr "vesivoima"
 
 #: trans_presets.java:2231
 msgid "fossil"
-msgstr ""
+msgstr "fossiilinen polttoaine"
 
 #: trans_presets.java:2231
 msgid "nuclear"
-msgstr ""
+msgstr "ydinvoima"
 
 #: trans_presets.java:2231
 msgid "coal"
-msgstr ""
+msgstr "kivihiili"
 
 #: trans_presets.java:2231
@@ -9869,5 +9915,5 @@
 #: trans_presets.java:2231
 msgid "gas"
-msgstr ""
+msgstr "kaasu"
 
 #: trans_presets.java:2235
@@ -9909,9 +9955,9 @@
 #: trans_presets.java:2258
 msgid "Voltage"
-msgstr ""
+msgstr "Jännite"
 
 #: trans_presets.java:2259
 msgid "Amount of Wires"
-msgstr ""
+msgstr "Johtojen määrä"
 
 #: trans_presets.java:2265
@@ -9941,5 +9987,5 @@
 #: trans_presets.java:2280
 msgid "Telephone"
-msgstr ""
+msgstr "Puhelin"
 
 #: trans_presets.java:2281
@@ -9973,5 +10019,5 @@
 #: trans_presets.java:2292
 msgid "Recycling"
-msgstr ""
+msgstr "Kierrätys"
 
 #: trans_presets.java:2293
@@ -9981,5 +10027,5 @@
 #: trans_presets.java:2295
 msgid "Batteries"
-msgstr ""
+msgstr "Paristot"
 
 #: trans_presets.java:2296
@@ -9989,21 +10035,21 @@
 #: trans_presets.java:2297
 msgid "Clothes"
-msgstr ""
+msgstr "Vaatteet"
 
 #: trans_presets.java:2298
 msgid "Glass"
-msgstr ""
+msgstr "Lasi"
 
 #: trans_presets.java:2299
 msgid "Paper"
-msgstr ""
+msgstr "Paperi"
 
 #: trans_presets.java:2300
 msgid "Scrap Metal"
-msgstr ""
+msgstr "Romumetalli"
 
 #: trans_presets.java:2303
 msgid "Bench"
-msgstr ""
+msgstr "Penkki"
 
 #: trans_presets.java:2307
@@ -10025,5 +10071,5 @@
 #: trans_presets.java:2313 trans_presets.java:2790
 msgid "Height"
-msgstr ""
+msgstr "Korkeus"
 
 #: trans_presets.java:2313
@@ -10037,9 +10083,9 @@
 #: trans_presets.java:2313
 msgid "full"
-msgstr ""
+msgstr "täysi"
 
 #: trans_presets.java:2316
 msgid "Fountain"
-msgstr ""
+msgstr "Lähde"
 
 #: trans_presets.java:2317
@@ -10049,5 +10095,5 @@
 #: trans_presets.java:2322
 msgid "Drinking Water"
-msgstr ""
+msgstr "Juomavesi"
 
 #: trans_presets.java:2323
@@ -10089,5 +10135,5 @@
 #: trans_presets.java:2349
 msgid "Kiosk"
-msgstr ""
+msgstr "Kioski"
 
 #: trans_presets.java:2350
@@ -10241,5 +10287,5 @@
 #: trans_presets.java:2413
 msgid "Cash"
-msgstr ""
+msgstr "Raha"
 
 #: trans_presets.java:2414
@@ -10729,5 +10775,5 @@
 #: trans_presets.java:2806
 msgid "Peak"
-msgstr ""
+msgstr "Huippu"
 
 #: trans_presets.java:2807
@@ -10777,5 +10823,5 @@
 #: trans_presets.java:2845
 msgid "Heath"
-msgstr ""
+msgstr "Nummi"
 
 #: trans_presets.java:2846
@@ -10875,4 +10921,7 @@
 msgstr ""
 
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Valinta: %d polku(a) ja %d piste(ttä)"
+
 #~ msgid "An error occoured: {0}"
 #~ msgstr "Tapahtui virhe: {0}"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 12692)
+++ applications/editors/josm/i18n/po/fr.po	(revision 12719)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 06:29+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 10:10+0000\n"
 "Last-Translator: nin2jardin <Unknown>\n"
 "Language-Team: Fr\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -138,6 +138,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant de "
@@ -173,11 +173,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Il est possible que des tags soient manquants"
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Préparation des données..."
@@ -200,36 +199,40 @@
 msgstr "Téléchargement des points {0} à {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Version inconnue"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> n’a pas de ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "L’objet avec l’id=0 est illégal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Attribut requis manquant \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "id du noeud malformé"
 
@@ -245,5 +248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Fournissez un bref comentaire aux changements que vous envoyez :"
 
@@ -398,10 +401,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignore l’URL malformé : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignore le fichier malformé d’URL : \"{0}\""
 
@@ -576,5 +579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -584,5 +587,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -593,5 +596,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Les ajoute tous à la sélection initale. Cela peut être un texte de recherche "
@@ -670,10 +673,10 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utilser l’étiquette prédéfinie \"{0}\" du groupe \"{1}\""
+msgstr "Utiliser l’étiquette prédéfinie \"{0}\" du groupe \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:391
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr "Utilser l’étiquette prédéfinie \"{0}\""
+msgstr "Utiliser l’étiquette prédéfinie \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:433
@@ -795,5 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -805,5 +808,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -849,5 +852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -867,5 +870,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Rôle"
@@ -916,5 +919,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -936,18 +939,18 @@
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Éditer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Editer la relation #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -961,46 +964,46 @@
 "choix de façon sensible."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Occupé par"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Ajouter la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Ajouter les objets sélectionnés en tant que memebres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Effacer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Supprimer tous les objets sélectionnés de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Supprimer le membre de la ligne actuelle de cette relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -1011,33 +1014,33 @@
 msgstr "Sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 "Mettre en évidence le membre de la ligne actuelle comme une sélection de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les noeuds incomplets dans la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Membres : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Il y a eu des conflits pendant l’import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Erreur d'analyse de la réponse du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1051,5 +1054,5 @@
 msgstr "Erreur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Impossible de se connecter au serveur."
@@ -1077,5 +1080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1173,14 +1176,14 @@
 "Fusionner le calque immédiatement en dessous avec le calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Afficher une liste de la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1191,29 +1194,51 @@
 "liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Zoomer sur le(s) élément(s) sélectionné(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Actualiser la liste de sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Rechercher des objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Sélection : %d chemin(s) et %d noeud(s)"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} chemin"
+msgstr[1] "{0} chemins"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} nœud)"
+msgstr[1] " ({0} nœuds)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relation"
+msgstr[1] "relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Description : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1250,5 +1275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1359,5 +1384,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr "Créer un marqueur audio au niveau de la tête de lecture"
 
@@ -1405,5 +1430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1413,5 +1438,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1420,5 +1445,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "Impossible de créer un nouveau marqueur audio."
 
@@ -2071,5 +2096,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
@@ -2084,12 +2109,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 msgid "Tagging preset source"
-msgstr ""
+msgstr "Source d'étiquette prédéfinie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
-"Les sources (url ou nom de fichier) des fichiers de définitions des "
+"Les sources (URL ou nom de fichier) des fichiers de définitions des "
 "étiquettes prédéfinies. Voir http://josm.openstreetmap.de/wiki/"
 "TaggingPresets pour plus d'informations"
@@ -2318,5 +2343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
 msgid "Label audio (and image and web) markers."
-msgstr "Étiquetter les marqueurs audio (et image et web)."
+msgstr "Étiquetter les marqueurs audio (image et web)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
@@ -2365,5 +2390,5 @@
 "button icons."
 msgstr ""
-"Placer du texte à côté des marqueurs audio (et image et web) ainsi que leurs "
+"Placer du texte à côté des marqueurs audio (image et web) ainsi que leurs "
 "icônes."
 
@@ -3220,9 +3245,9 @@
 msgstr "Impossible de charger les préférences depuis le serveur."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "non étiqueté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "texte"
@@ -3409,5 +3434,5 @@
 #, java-format
 msgid "Last change at {0}"
-msgstr "Dernier changement à {0}"
+msgstr "Dernier changement le {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
@@ -3634,10 +3659,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Le nœud sélectionné ne fait pas partie d'un chemin."
 msgstr[1] "Les nœuds sélectionné ne font partie d'aucun chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3647,9 +3673,9 @@
 "également sélectionner un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Les nœuds sélectionnés ne font pas partie du même chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3657,11 +3683,11 @@
 msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3671,5 +3697,5 @@
 "sélectionner les noeuds au milieu du chemin.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3680,5 +3706,5 @@
 "Vous devriez vérifier cela et corriger si nécessaire."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3814,5 +3840,5 @@
 msgstr "Impossible de lire \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3820,6 +3846,6 @@
 msgstr "Extension de fichier inconnue : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3828,29 +3854,29 @@
 msgstr "Marqueurs de {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Coordonnées importées: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr "Phrases malformées: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Erreurs de somme de contrôle : "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Phrases inconnues: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Zero coordonnées: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "Succès de l'import des trames NMEA"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "Erreur lors de l'import des trames NMEA!"
@@ -3880,10 +3906,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
+msgid "Could not read from URL: \"{0}\""
 msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Erreur d’analyse dans l’URL : \"{0}\""
 
@@ -4246,5 +4272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4255,5 +4281,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Quitter"
@@ -4305,5 +4331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
 
@@ -4322,5 +4348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Merci de sélectionner de(s) chemin(s) rapproché(s) d'au moins 4 noeuds"
 
@@ -4397,5 +4423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Ouvrir une URL."
 
@@ -4513,9 +4539,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Aucun de ces noeuds n’est collé à quelque chose d’autre."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Aucun des noeuds de ce chemin n'est collé à quelque chose d'autre."
 
@@ -4755,5 +4783,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119
 msgid "Roles in relations referring to"
-msgstr ""
+msgstr "Rôles de la relation de référence"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
@@ -4763,6 +4791,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "Les changements suivants aux propriétés du chemin sont suggérés après son "
@@ -4795,5 +4823,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr "Impossible de dupliquer un chemin non ordonné"
 
@@ -5007,5 +5035,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 msgid "Warning"
-msgstr "Attention"
+msgstr "Avertissement"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -5069,5 +5097,5 @@
 #, java-format
 msgid "Version: {0}<br>Last change at {1}"
-msgstr "Version: {0}<br>Dernier changement à {1}"
+msgstr "Version: {0}<br>Dernier changement le {1}"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -5092,4 +5120,8 @@
 msgid "Permitted actions"
 msgstr "Actions permises"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, Il est possible que des tags soient manquants"
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5173,5 +5205,5 @@
 #, java-format
 msgid "{0} nodes so far..."
-msgstr ""
+msgstr "Déjà {0} noeuds"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
@@ -5581,5 +5613,5 @@
 #, java-format
 msgid "Version {0} - Last change at {1}"
-msgstr "Version {0} - Dernier changement à {1}"
+msgstr "Version {0} - Dernier changement le {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:95
@@ -5952,8 +5984,8 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-"Les sources (url ou nom de fichier) du vérificateur orthographique (voir "
+"Les sources (URL ou nom de fichier) du vérificateur orthographique (voir "
 "http://wiki.openstreetmap.org/index.php/User:JLS/speller) ou les fichiers de "
 "données de vérification des étiquettes."
@@ -6324,5 +6356,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
 msgid "Importing data from device."
-msgstr "Importer des données depuis le GPS."
+msgstr "Importer des données depuis le GPS"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
@@ -6363,5 +6395,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Import de données depuis le GPS Globalsat DG100 en couche GPX."
 
@@ -6380,11 +6412,11 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
 "Le(s) chemin(s) sélectionné(s) contient des noeud en dehors de la zone "
-"téléchargé. Certains noeuds utilisés en dehors de la zone pourraient être "
-"supprimés.\n"
+"téléchargé.\n"
+"Certains noeuds utilisés en dehors de la zone pourraient être supprimés.\n"
 "Voulez-vous vraiment continuer ?"
 
@@ -6398,14 +6430,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
-"La sélection contient {0} chemin. Êtes vous sûr(e) de vouloir tous les "
-"simplifier ?"
 msgstr[1] ""
-"La sélection contient {0} chemins. Êtes vous sûr(e) de vouloir tous les "
-"simplifier ?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6553,5 +6581,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr "Ouvrir une autre trace GPX"
 
@@ -6639,5 +6667,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Pas de couche GPX sélectionnée. Impossible de charger une trace."
 
@@ -6683,9 +6711,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr "Mettre à jour l’URL du site"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr "URL invalide"
 
@@ -6752,5 +6780,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer"
 
@@ -6827,5 +6855,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Couche WMS ({0}), téléchargement automatique au zoom {1}"
 
@@ -6909,7 +6937,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6973,5 +7001,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 "Régler le début et la fin pour le calcul d’itinéraire automatique. Bouton du "
@@ -7024,5 +7052,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -7084,9 +7112,9 @@
 msgstr "nom de rue abrégé"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Début du tunnel"
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -7101,65 +7129,65 @@
 msgstr "Pont"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr "Village/Ville"
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parking"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr "Sens unique"
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr "Eglise"
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr "Station essence"
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hôtel"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Restaurant"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Shopping"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr "WC"
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr "Camping"
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Autoroute"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Route primaire"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Route secondaire"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Route mineure"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Rue résidentielle"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr "Essai"
@@ -8119,9 +8147,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr "Herse"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Modifier une herse"
 
@@ -8791,5 +8819,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr "kebab"
 
@@ -9392,9 +9420,9 @@
 #: trans_presets.java:1766
 msgid "10pin"
-msgstr ""
+msgstr "Bowling"
 
 #: trans_presets.java:1767
 msgid "Edit 10pin"
-msgstr "Éditer un bowling"
+msgstr "Éditer un Bowling"
 
 #: trans_presets.java:1773
@@ -11133,4 +11161,7 @@
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Sélection : %d chemin(s) et %d noeud(s)"
 
 #~ msgid "Java OpenStreetMap Editor Version {0}"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 12692)
+++ applications/editors/josm/i18n/po/it.po	(revision 12719)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 12:54+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 01:40+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -134,6 +134,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione prima "
@@ -169,11 +169,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, è possibile che manchino delle etichette."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Preparazione dei dati in corso."
@@ -196,36 +195,40 @@
 msgstr "Scaricamento dei punti da {0} a {1} in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Trovato <nd> elemento in non-percorso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> ha zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "Trovato etichetta <member> su una non relazione."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Attributo richiesto mancante \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Id del nodo malformato"
 
@@ -240,5 +243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
 
@@ -392,10 +395,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un URL malformato: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un URL di file malformato: \"{0}\""
 
@@ -566,5 +569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -574,5 +577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -583,5 +586,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Aggiungi ognuno alla selezione iniziale. Può essere una stringa di ricerca "
@@ -784,5 +787,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -794,5 +797,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -838,5 +841,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -856,5 +859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Ruolo"
@@ -905,5 +908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -925,18 +928,18 @@
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Crea nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Modifica nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Modifica la relazione #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -950,47 +953,47 @@
 "scelte dell'utente in modo sensibile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Occupato da"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Etichette (un valore vuoto cancella l'etichetta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Aggiungi la selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Aggiungi tutti gli oggetti selezionati come membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Elimina selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Elimina tutti gli oggetti attualmente selezionati dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 "Cancella il membro dalla riga della tabella utilizzata da questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -1001,5 +1004,5 @@
 msgstr "Seleziona"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
@@ -1007,28 +1010,28 @@
 "di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Membri: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Si sono verificati dei conflitti durante l'importazione."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Errore di scansione nella risposta del server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1042,5 +1045,5 @@
 msgstr "Errore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Impossibile connettersi al server."
@@ -1068,5 +1071,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1163,14 +1166,14 @@
 msgstr "Unisci il layer direttamente nel layer selezionato sotto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Apri una finestra con la lista delle selezioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1179,29 +1182,51 @@
 msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Fai lo zoom sugli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Ricarica la lista di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Cerca degli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Zoom sulla selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Selezione: %d percorso/i e %d nodo/i"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} nodo)"
+msgstr[1] " ({0} nodi)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relazione"
+msgstr[1] "relazioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Descrizione: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1238,5 +1263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Informazioni"
@@ -1347,5 +1372,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr "Esegui il marcatore audio all'inizio del brano"
 
@@ -1391,5 +1416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1399,5 +1424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1406,5 +1431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "Impossibile creare un nuovo segnaposto Audio"
 
@@ -2055,5 +2080,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
@@ -2072,8 +2097,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
-"Il sorgente (url o filename) dei files delle etichette predefinite. Vedi "
+"Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi "
 "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
 
@@ -3206,9 +3231,9 @@
 msgstr "Impossibile scaricare le preferenze dal server."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "senza tag"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "testo"
@@ -3618,10 +3643,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Il nodo selezionato non è parte di alcun percorso."
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3631,9 +3656,9 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "I nodi selezionati non condividono il medesimo percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3641,10 +3666,10 @@
 msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3654,5 +3679,5 @@
 "seleziona i nodi in mezzo al percorso)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3663,5 +3688,5 @@
 "Controllare ed eventualmente correggere."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3796,5 +3821,5 @@
 msgstr "Impossibile leggere \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3802,6 +3827,6 @@
 msgstr "Estensione del file sconosciuta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3810,29 +3835,29 @@
 msgstr "Marcatori da {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Coordinate importate: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr "Formato non corretto: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Errori di checksum: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Frase sconosciuta "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Coordinate iniziali "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "NMEA importato con successo"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "Importazione NMEA non riuscita!"
@@ -3862,10 +3887,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr ""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Impossibile leggere \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Errore nell'interpretazione dei dati dell'URL: \"{0}\""
 
@@ -4227,5 +4252,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4236,5 +4261,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Esci"
@@ -4282,5 +4307,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
 "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi"
@@ -4300,5 +4325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Selezionare uno o più percorsi che abbiano almeno quattro nodi."
 
@@ -4373,8 +4398,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49
 msgid "Open Location..."
-msgstr ""
+msgstr "Apri indirizzo URL..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Apri un indirizzo URL."
 
@@ -4385,5 +4410,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:61
 msgid "Download Location"
-msgstr ""
+msgstr "Scarica indirizzo URL"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
@@ -4492,9 +4517,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Questi nodi non sono attaccati ad altri elementi."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Nessun nodo del percorso è attaccato ad altri elementi."
 
@@ -4746,6 +4773,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "Invertendo la direzione di questo percorso si consiglia di apportare i "
@@ -4779,5 +4806,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr "Impossibile duplicare un percorso senza direzione."
 
@@ -4998,4 +5025,7 @@
 "upload these data. Maybe you have selected the wrong layer?"
 msgstr ""
+"<html>I dati selezionati contengono riferimenti provenienti da "
+"OpenStreetBugs.<br>Non si possono caricare questi dati. E' possibile che sia "
+"stato selezionato un livello sbagliato?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -5076,4 +5106,8 @@
 msgid "Permitted actions"
 msgstr "Azioni permesse"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, è possibile che manchino delle etichette."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5124,9 +5158,9 @@
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40
 msgid "Import TCX File..."
-msgstr ""
+msgstr "Importa file TCX..."
 
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:39
 msgid "Import TCX file as GPS track"
-msgstr ""
+msgstr "Importa file TCX come tracciato GPS"
 
 #: ../plugins/slippy_map_chooser/src/SlippyMapChooser.java:94
@@ -5342,29 +5376,29 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
 msgid "Normal"
-msgstr ""
+msgstr "Normale"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
 msgid "Rotate 90"
-msgstr ""
+msgstr "Ruota di 90°"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
 msgid "Rotate 180"
-msgstr ""
+msgstr "Ruota di 180°"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
 msgid "Rotate 270"
-msgstr ""
+msgstr "Ruota di 270°"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
 msgid "Imported Images"
-msgstr ""
+msgstr "Immagini importate"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:37
 msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr ""
+msgstr "File immagine (*.jpg, *.jpeg, *.png, *.gif)"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Open images with ImageWayPoint"
-msgstr ""
+msgstr "Apri immagini con ImageWayPoint"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:49
@@ -5380,5 +5414,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
 msgid "Previous image"
-msgstr ""
+msgstr "Immagine precedente"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
@@ -5389,30 +5423,30 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next image"
-msgstr ""
+msgstr "Immagine successiva"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
 msgid "Rotate left"
-msgstr ""
+msgstr "Ruota a sinistra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
 msgid "Rotate image left"
-msgstr ""
+msgstr "Ruota l'immagine a sinistra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
 msgid "Rotate right"
-msgstr ""
+msgstr "Ruota a destra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
 msgid "Rotate image right"
-msgstr ""
+msgstr "Ruota l'immagine a destra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr ""
+msgstr "Immagine WayPoint"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Visualizza le foto non geo-referenziate"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -5940,8 +5974,8 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-"Sorgente (url o nome del file) del controllo ortografico (vedi http://wiki."
+"Sorgente (URL o nome del file) del controllo ortografico (vedi http://wiki."
 "openstreetmap.org/index.php/User:JLS/speller) o file dati per il controllo "
 "delle etichette."
@@ -6352,5 +6386,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importa dati da Globalsat Datalogger DG100 in un livello GPX."
 
@@ -6369,9 +6403,10 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
-"La/le strade selezionate hanno dei nodi fuori dalla zona dei dati scaricati. "
+"La/le strade selezionate hanno dei nodi fuori dalla zona dei dati "
+"scaricati.\n"
 "Alcuni nodi potrebbero essere cancellati accidentalmente.\n"
 "Sei veramente sicuro di continuare ?"
@@ -6421,5 +6456,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:36
 msgid "Open images with AgPifoJ..."
-msgstr ""
+msgstr "Apri immagini con AgPifoJ..."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:91
@@ -6536,5 +6571,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr "Apri un altro tracciato GPX"
 
@@ -6624,6 +6659,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
-msgstr "Nessun livello Gpx selezionato. Impossibile caricare un tracciato."
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr "Nessun livello GPX selezionato. Impossibile caricare un tracciato."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -6668,9 +6703,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr "Aggiorna URL del sito"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr "URL non valido"
 
@@ -6713,5 +6748,5 @@
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:43
 msgid "Osmarender"
-msgstr ""
+msgstr "Osmarender"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:90
@@ -6736,5 +6771,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr "Scarica l'immagine rettificata dal WMS Map Rectifer di Metacarta"
 
@@ -6810,5 +6845,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
@@ -6891,7 +6926,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6955,5 +6990,6 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+#, fuzzy
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 "Imposta inizio/fine per autorouting. Tasto centrale del mouse per "
@@ -7006,5 +7042,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -7066,9 +7102,9 @@
 msgstr "abbreviazione del nome della strada"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Inizio galleria"
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -7083,65 +7119,65 @@
 msgstr "Bridge"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr "Insediamento urbano/Città (meno di 10.000 abitanti)"
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parking"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr "Senso unico"
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr "Chiesa"
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr "Stazione di rifornimento"
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hotel"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Ristorante"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Acquisti"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr "WC"
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr "Campeggio"
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Motorway"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Primary"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Secondary"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Strada non classificata"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Residential"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr "Test"
@@ -7950,9 +7986,9 @@
 #: trans_presets.java:740
 msgid "Zebra Crossing"
-msgstr ""
+msgstr "Strisce zebrate"
 
 #: trans_presets.java:741
 msgid "Edit a crossing"
-msgstr ""
+msgstr "Modifica un attraversamento pedonale"
 
 #: trans_presets.java:743
@@ -7966,5 +8002,5 @@
 #: trans_presets.java:744
 msgid "Ref"
-msgstr ""
+msgstr "Riferimento"
 
 #: trans_presets.java:744
@@ -8102,9 +8138,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr "Saracinesca"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Modifica saracinesca"
 
@@ -8774,5 +8810,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr "kebab"
 
@@ -10115,17 +10151,17 @@
 #: trans_presets.java:2235
 msgid "Power Station"
-msgstr ""
+msgstr "Stazione elettrica"
 
 #: trans_presets.java:2236
 msgid "Edit power station"
-msgstr ""
+msgstr "Modifica stazione elettrica"
 
 #: trans_presets.java:2241
 msgid "Power Sub Station"
-msgstr ""
+msgstr "Sottostazione elettrica"
 
 #: trans_presets.java:2242
 msgid "Edit power sub station"
-msgstr ""
+msgstr "Modifica sottostazione elettrica"
 
 #: trans_presets.java:2245 trans_presets.java:2257
@@ -10143,17 +10179,17 @@
 #: trans_presets.java:2253
 msgid "Power Line"
-msgstr ""
+msgstr "Linea elettrica"
 
 #: trans_presets.java:2254
 msgid "Edit power line"
-msgstr ""
+msgstr "Modifica linea elettrica"
 
 #: trans_presets.java:2258
 msgid "Voltage"
-msgstr ""
+msgstr "Tensione"
 
 #: trans_presets.java:2259
 msgid "Amount of Wires"
-msgstr ""
+msgstr "Numero di linee"
 
 #: trans_presets.java:2265
@@ -11038,9 +11074,9 @@
 #: trans_presets.java:2860
 msgid "Riverbank"
-msgstr ""
+msgstr "Argine"
 
 #: trans_presets.java:2861
 msgid "Edit a riverbank"
-msgstr ""
+msgstr "Modifica un argine"
 
 #: trans_presets.java:2866
@@ -11054,37 +11090,37 @@
 #: trans_presets.java:2872
 msgid "Wetland"
-msgstr ""
+msgstr "Zona umida"
 
 #: trans_presets.java:2873
 msgid "Edit Wetland"
-msgstr ""
+msgstr "Modifica zona umida"
 
 #: trans_presets.java:2876
 msgid "swamp"
-msgstr ""
+msgstr "palude"
 
 #: trans_presets.java:2876
 msgid "bog"
-msgstr ""
+msgstr "torbiera"
 
 #: trans_presets.java:2876
 msgid "marsh"
-msgstr ""
+msgstr "palude alluvionale"
 
 #: trans_presets.java:2876
 msgid "reedbed"
-msgstr ""
+msgstr "canneto"
 
 #: trans_presets.java:2876
 msgid "saltmarsh"
-msgstr ""
+msgstr "palude salata"
 
 #: trans_presets.java:2876
 msgid "tidalflat"
-msgstr ""
+msgstr "barena"
 
 #: trans_presets.java:2876
 msgid "mangrove"
-msgstr ""
+msgstr "mangrovie"
 
 #: trans_presets.java:2879
@@ -11119,2 +11155,5 @@
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Selezione: %d percorso/i e %d nodo/i"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 12692)
+++ applications/editors/josm/i18n/po/pl.po	(revision 12719)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
 "PO-Revision-Date: 2008-12-28 11:02+0000\n"
 "Last-Translator: Piotr Gorski <piotr@prnet.pl>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -138,7 +138,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
-msgstr ""
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
+msgstr ""
+"Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem "
+"błędu."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
@@ -171,11 +173,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Przygotowywanie danych..."
@@ -198,36 +199,40 @@
 msgstr "Pobieram punkty od {0} do {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Nieznana wersja"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "Znaleziono tag <member> w"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Niedozwolony obiekt z id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Brak wymaganego atrybutu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr ""
 
@@ -241,5 +246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Zapewnij krótki opis zmian które wysyłasz do serwera:"
 
@@ -385,10 +390,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
@@ -556,5 +561,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -562,5 +567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -569,5 +574,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 
@@ -769,5 +774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -779,5 +784,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -823,5 +828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -841,5 +846,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Rola"
@@ -890,5 +895,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -910,18 +915,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
+msgid "Create new relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
-msgid "Create new relation"
+msgid "Edit new relation"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
-msgid "Edit new relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
 #, java-format
 msgid "Edit relation #{0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -931,46 +936,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
+msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -981,32 +986,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1020,5 +1025,5 @@
 msgstr "Błąd"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Nie można połączyć się z serwerem."
@@ -1046,5 +1051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1137,14 +1142,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Bieżące zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1153,29 +1158,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Szukaj obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkty"
+msgstr[2] "{0} punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} węzeł)"
+msgstr[1] " ({0} węzły)"
+msgstr[2] " ({0} węzłów)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relacja"
+msgstr[1] "relacje"
+msgstr[2] "relacji"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Opis: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1212,5 +1242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Info"
@@ -1320,5 +1350,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1364,5 +1394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1370,10 +1400,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr ""
 
@@ -2023,5 +2053,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
@@ -2041,5 +2071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -3080,9 +3110,9 @@
 msgstr "Pobranie preferencji z serwera nie powiodło się."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "tekst"
@@ -3487,10 +3517,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr[1] "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr[2] "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3498,9 +3530,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3508,10 +3540,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3519,5 +3551,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3525,5 +3557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3658,5 +3690,5 @@
 msgstr "Nie można odczytać \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3664,6 +3696,6 @@
 msgstr "Nieznane rozszerzenie pliku: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3672,29 +3704,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr ""
@@ -3724,10 +3756,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr ""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Nie można odczytać \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr ""
 
@@ -4072,5 +4104,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4078,5 +4110,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Wyjdź"
@@ -4123,5 +4155,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
 
@@ -4140,6 +4172,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
-msgstr ""
+msgid "Please select one ore more closed ways of at least four nodes."
+msgstr "Wybierz co najmniej cztery węzły."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
@@ -4213,6 +4245,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
-msgstr ""
+msgid "Open an URL."
+msgstr "Otwórz plik."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:54
@@ -4329,9 +4361,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+msgid "None of these nodes are glued to anything else."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
@@ -4571,6 +4603,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 
@@ -4601,5 +4633,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr ""
 
@@ -4882,4 +4914,8 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
+msgstr ""
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
 msgstr ""
 
@@ -5706,5 +5742,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6104,5 +6140,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
@@ -6121,6 +6157,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6141,5 +6177,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6282,5 +6317,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr ""
 
@@ -6366,5 +6401,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6410,9 +6445,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+msgid "Update Site URL"
+msgstr "Adres URL serwera"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr ""
 
@@ -6476,5 +6511,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
 
@@ -6550,5 +6585,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6628,7 +6663,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6668,5 +6703,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6717,5 +6752,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -6777,9 +6812,9 @@
 msgstr ""
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr ""
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6794,65 +6829,65 @@
 msgstr "most"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "parking"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr ""
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr ""
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hotel"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "restauracja"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr ""
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr ""
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "autostrada"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "droga krajowa"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "droga wojewódzka"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "droga gminna"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "droga lokalna"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr ""
@@ -7808,10 +7843,10 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr ""
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
-msgstr ""
+msgid "Edit a Portcullis"
+msgstr "Edycja doku"
 
 #: trans_presets.java:905
@@ -8480,5 +8515,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr ""
 
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 12692)
+++ applications/editors/josm/i18n/po/ro.po	(revision 12719)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
 "PO-Revision-Date: 2008-12-23 03:09+0000\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:57+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 
@@ -157,11 +157,11 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#, fuzzy
+msgid "NullPointerException, possibly some missing tags."
+msgstr "Excepţie pointer nul. Posibil lipsesc nişte etichete."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Pregătesc datele..."
@@ -182,36 +182,41 @@
 msgstr "Descarc punctele {0} până la {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Versiune necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Obiect ilegal cu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+#, fuzzy
+msgid "Ill-formed node id"
 msgstr "Note id malformat"
 
@@ -225,5 +230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr ""
 
@@ -368,11 +373,11 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:481
-#, java-format
-msgid "Ignoring malformed url: \"{0}\""
+#, fuzzy, java-format
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignor adresa malformată: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
-#, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+#, fuzzy, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignor adresa malformată către fişier: \"{0}\""
 
@@ -537,6 +542,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+#, fuzzy
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -545,6 +551,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+#, fuzzy
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -553,7 +560,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#, fuzzy
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Adaugă pe fiecare la selecţia iniţială. Poate fi un şir de căutare tip "
@@ -758,5 +766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -768,5 +776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -813,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -831,5 +839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr ""
@@ -880,5 +888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -900,18 +908,18 @@
 msgstr "Şterge cheia selectată din toate obiectele"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
+msgid "Create new relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
-msgid "Create new relation"
+msgid "Edit new relation"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
-msgid "Edit new relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
 #, java-format
 msgid "Edit relation #{0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -921,46 +929,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+#, fuzzy
+msgid "Move the currently selected members up"
+msgstr "Mută stratul selectat un rând în sus."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#, fuzzy
+msgid "Move the currently selected members down"
+msgstr "Mută stratul selectat un rând în jos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -971,32 +981,32 @@
 msgstr "Selectaţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Au existat conflicte în timpul importului."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1010,5 +1020,5 @@
 msgstr "Eroare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr ""
@@ -1036,5 +1046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1129,14 +1139,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Selecţia curentă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Deschide o fereastra cu o listă de selecţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1147,29 +1157,54 @@
 "mai sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Reîncarcă lista de selecţii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Căutare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Caută obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "cale"
+msgstr[1] "căi"
+msgstr[2] "de căi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "nod"
+msgstr[1] "noduri"
+msgstr[2] "de noduri"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "selecţie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1206,5 +1241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Informaţii"
@@ -1314,5 +1349,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1358,5 +1393,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1364,10 +1399,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr ""
 
@@ -2013,8 +2048,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#, fuzzy
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATENŢIE: Parola este păstrată în format text clar în fişierul de "
@@ -2033,5 +2069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -3069,9 +3105,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr ""
@@ -3472,10 +3508,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3483,9 +3520,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3493,10 +3530,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3504,5 +3541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3510,5 +3547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3643,5 +3680,5 @@
 msgstr "Nu am putut citi \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3649,6 +3686,6 @@
 msgstr "Extensie fişier necunoscută : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3657,29 +3694,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr ""
@@ -3708,11 +3745,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
-#, java-format
-msgid "Could not read from url: \"{0}\""
+#, fuzzy, java-format
+msgid "Could not read from URL: \"{0}\""
 msgstr "Nu am putut citi de la adresa: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
-#, java-format
-msgid "Parsing error in url: \"{0}\""
+#, fuzzy, java-format
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Eroare de prelucrare la adresa: \"{0}\""
 
@@ -4059,5 +4096,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4065,5 +4102,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Ieşire"
@@ -4110,5 +4147,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
 
@@ -4127,6 +4164,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
-msgstr ""
+#, fuzzy
+msgid "Please select one ore more closed ways of at least four nodes."
+msgstr "Vă rog selectaţi cel puţin petru noduri."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
@@ -4198,6 +4236,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
-msgstr ""
+#, fuzzy
+msgid "Open an URL."
+msgstr "Deschide un fişier."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:54
@@ -4314,9 +4353,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+msgid "None of these nodes are glued to anything else."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
@@ -4556,6 +4595,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 
@@ -4586,5 +4625,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
+msgid "Can't duplicate unordered way."
 msgstr ""
 
@@ -4867,4 +4906,8 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
+msgstr ""
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
 msgstr ""
 
@@ -5691,5 +5734,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6089,5 +6132,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
@@ -6106,6 +6149,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6126,5 +6169,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6265,5 +6307,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr ""
 
@@ -6349,5 +6391,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6393,9 +6435,10 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+#, fuzzy
+msgid "Update Site URL"
+msgstr "Adresă server principal"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr ""
 
@@ -6459,5 +6502,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
 
@@ -6533,5 +6576,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6611,7 +6654,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6651,5 +6694,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6700,5 +6743,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -6760,9 +6803,9 @@
 msgstr ""
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr ""
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6777,65 +6820,65 @@
 msgstr ""
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr ""
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr ""
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr ""
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr ""
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr ""
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr ""
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr ""
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr ""
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr ""
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr ""
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr ""
@@ -7791,9 +7834,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr ""
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr ""
 
@@ -8463,5 +8506,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr ""
 
@@ -10809,7 +10852,4 @@
 #~ msgstr "Java OpenStreetMap Editor Versiunea {0}"
 
-#~ msgid "NullPointerException. Possible some missing tags."
-#~ msgstr "Excepţie pointer nul. Posibil lipsesc nişte etichete."
-
 #~ msgid "Remove \"{0}\" for"
 #~ msgstr "Elimină \"{0}\" pentru"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 12692)
+++ applications/editors/josm/i18n/po/ru.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-29 12:41+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-30 23:44+0000\n"
 "Last-Translator: JekaDer <yourname@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -138,7 +138,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
-msgstr ""
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
+msgstr ""
+"Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта об "
+"ошибке."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
@@ -171,11 +173,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "Исключение нулевого указателя. Возможно, отсутствуют тэги."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Подготовка данных..."
@@ -198,36 +199,40 @@
 msgstr "Скачиваю точки с {0} до {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Неизвестная версия"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Найден элемент <nd> вне пути."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
 msgstr "Найден тэг <member> вне отношения."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Отсутствует необходимый атрибут \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Неверный номер точки"
 
@@ -241,5 +246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Кратко опишите изменения, которые будут загружены:"
 
@@ -387,10 +392,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорируется неверный адрес файла: \"{0}\""
 
@@ -558,5 +563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -566,5 +571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -575,5 +580,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 "Добавить каждое к исходному выделению. Может быть поисковым запросом, либо "
@@ -778,5 +783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -788,5 +793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -833,5 +838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -851,5 +856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Роль"
@@ -900,5 +905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -920,18 +925,18 @@
 msgstr "Удалить выбранный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Править новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Править отношение #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -944,46 +949,46 @@
 "бы определял тип отношения и разумным образом ограничивал редактирование."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Объект"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Тэги (пустое значение удаляет тэг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Члены"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Переместить выбранных членов отношения вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Переместить выбранных членов отношения вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Добавить выбранное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Сделать все выбранные объекты членами отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Удалить выбранное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Удалить выбранные объекты из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Удалить текущую строку из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -994,32 +999,32 @@
 msgstr "Выбор"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Выбрать в JOSM объект из текущей строки таблицы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Скачать членов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Члены: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "При импортировании возникли конфликтные ситуации."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Ошибка при парсинге ответа от сервера."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1033,5 +1038,5 @@
 msgstr "Ошибка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Невозможно связаться с сервером."
@@ -1059,5 +1064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1151,14 +1156,14 @@
 msgstr "Объединить выделенный слой с нижележащим."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Текущее выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Показать окно со списком выбранных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1167,29 +1172,54 @@
 msgstr "Выбрать на карте объекты, выбранные в списке вверху."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Масштаб по выбранным объектам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Обновить список выбранного."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Найти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Поиск объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Масштаб по выделению"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Выбрано: %d линий и %d точек"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} путевая точка"
+msgstr[1] "{0} путевые точки"
+msgstr[2] "{0} путевых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} точка)"
+msgstr[1] " ({0} точки)"
+msgstr[2] " ({0} точек)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "отношение"
+msgstr[1] "отношения"
+msgstr[2] "отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Описание: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1226,5 +1256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Сведения"
@@ -1334,5 +1364,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1378,5 +1408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1384,10 +1414,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr ""
 
@@ -2049,5 +2079,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> Пароль "
@@ -2066,5 +2096,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -3160,9 +3190,9 @@
 msgstr "Невозможно скачать параметры с сервера."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "без тэга"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "текст"
@@ -3573,11 +3603,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Выбранная точка не является частью какой-либо линии"
 msgstr[1] "Выбранные точки не являются частью какой-либо линии"
 msgstr[2] "Выбранные точки не являются частью какой-либо линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3586,9 +3617,9 @@
 "Выделенная точка входит в несколько линий. Пожалуйста, выделите и линию тоже."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "Выбранные точки не являются частью одной линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3597,10 +3628,10 @@
 msgstr[2] "Выбранная линия не содержит выбранных точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Чтобы разбить замкнутую линию, выберите две или более точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3610,5 +3641,5 @@
 "лини)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3618,5 +3649,5 @@
 "Проверьте, и при необходимости внесите корректировки."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3751,5 +3782,5 @@
 msgstr "Невозможно прочитать \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3757,6 +3788,6 @@
 msgstr "Неизвестное расширение файла: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3765,29 +3796,29 @@
 msgstr "Маркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr ""
@@ -3817,10 +3848,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
+msgid "Could not read from URL: \"{0}\""
 msgstr "Ошибка соединения с адресом: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Ошибка парсинга ссылки: \"{0}\""
 
@@ -4172,5 +4203,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4180,5 +4211,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Выход"
@@ -4229,5 +4260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
 "Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 "
@@ -4248,5 +4279,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr ""
 "Пожалуйста, выберите замкнутую линию(и), состоящую как минимум из четырёх "
@@ -4328,5 +4359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Открыть ссылку."
 
@@ -4444,9 +4475,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Ни одна из точек не связана с чем-либо."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Ни одна из точек линии не связана с чем-либо."
 
@@ -4689,6 +4722,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "При изменении направления линии, предлагается исправить следующие параметры "
@@ -4721,6 +4754,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
-msgstr ""
+msgid "Can't duplicate unordered way."
+msgstr "Создать копию линии"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -5014,4 +5047,8 @@
 msgid "Permitted actions"
 msgstr "Разрешённые действия"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "Исключение нулевого указателя. Возможно, отсутствуют тэги."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5852,5 +5889,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6252,5 +6289,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX."
 
@@ -6269,6 +6306,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6289,5 +6326,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6430,5 +6466,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr "Открыть другой трэк GPX"
 
@@ -6515,5 +6551,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6559,10 +6595,10 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+msgid "Update Site URL"
+msgstr "Обновить сайты"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
-msgstr ""
+msgid "Invalid URL"
+msgstr "Недопустимая дата"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
@@ -6625,5 +6661,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr "Скачать трансформированное изображение с WMS сервера Metacarta"
 
@@ -6699,5 +6735,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
@@ -6779,7 +6815,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6819,5 +6855,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6868,6 +6904,7 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
-msgstr ""
+#, fuzzy
+msgid "Streets NRW Geofabrik.de"
+msgstr "подложка Geofabrik.de"
 
 #: trans_validator.java:38
@@ -6928,9 +6965,9 @@
 msgstr "сокращённое название улицы"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Начало тоннеля"
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6945,65 +6982,65 @@
 msgstr "Мост"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr "Город/Село"
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Стоянка"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr "Односторонняя"
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr "Церковь"
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr "Заправка"
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Гостиница"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Ресторан"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Магазин"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr "Туалет"
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr "Кэмпинг"
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Автобан"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Основная"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Вторичная"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Не классифицировано"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Внутренняя"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr "Тест"
@@ -7963,9 +8000,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr "Опускающаяся решётка"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Править опускающуюся решётку"
 
@@ -8635,5 +8672,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr "кебаб"
 
@@ -10977,2 +11014,5 @@
 msgid "Edit Cliff"
 msgstr "Править скалу"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Выбрано: %d линий и %d точек"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 12692)
+++ applications/editors/josm/i18n/po/sl.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 04:38+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-30 23:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:57+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -128,6 +128,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 
@@ -161,11 +161,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Pripravljam podatke..."
@@ -186,36 +185,40 @@
 msgstr "Sprejem točk od {0} do {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Neznana različica"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "predmet z id=0 ni dovoljen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Neveljaven id točke"
 
@@ -229,5 +232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr ""
 
@@ -373,10 +376,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
@@ -544,5 +547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -550,5 +553,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -557,5 +560,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 
@@ -760,5 +763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -770,5 +773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -816,5 +819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -834,5 +837,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr ""
@@ -883,5 +886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -903,18 +906,18 @@
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Uredi novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Uredi relacijo #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -924,46 +927,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
+msgstr "Pomakni izbrano plast vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
+msgstr "Pomakni izbrano plast vrstico nižje."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Izbriši izbrane"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -974,32 +977,32 @@
 msgstr "Izberite"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1013,5 +1016,5 @@
 msgstr "Napaka"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr ""
@@ -1039,5 +1042,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1130,14 +1133,14 @@
 msgstr "Združi izbrano plast s plastjo pod njo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Trenutni izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Odpri okno s seznamom izbora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1146,29 +1149,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Povečava na izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Osveži seznam izbora."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Izbor: %d poti in %d vozlišč"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "Združi {0} poti"
+msgstr[1] "Združi {0} poti"
+msgstr[2] "Združi {0} poti"
+msgstr[3] "Združi {0} poti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} vozlišč)"
+msgstr[1] " ({0} vozlišče)"
+msgstr[2] " ({0} vozlišči)"
+msgstr[3] " ({0} vozlišča)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relacije"
+msgstr[1] "relacija"
+msgstr[2] "relaciji"
+msgstr[3] "relacije"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Izbrana površina"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1205,5 +1236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Podrobnosti"
@@ -1311,5 +1342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr ""
 
@@ -1355,5 +1386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1361,10 +1392,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr ""
 
@@ -2019,5 +2050,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -2033,5 +2064,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
@@ -3080,9 +3111,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr ""
@@ -3485,10 +3516,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Premakne izbrana vozlišča tako, da so na isti premici."
+msgstr[1] "Premakne izbrana vozlišča tako, da so na isti premici."
+msgstr[2] "Premakne izbrana vozlišča tako, da so na isti premici."
+msgstr[3] "Premakne izbrana vozlišča tako, da so na isti premici."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3496,9 +3530,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3506,10 +3540,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3517,5 +3551,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3523,5 +3557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3656,5 +3690,5 @@
 msgstr "Ni bilo možno prebrati \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3662,6 +3696,6 @@
 msgstr "Neznana končnica datoteke: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3670,29 +3704,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr ""
@@ -3722,10 +3756,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
+msgid "Could not read from URL: \"{0}\""
 msgstr "Ni mogoče brati z naslova: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
 msgstr "Napaka pri razločevanju na naslovu: \"{0}\""
 
@@ -4072,5 +4106,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4078,5 +4112,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Končaj"
@@ -4123,5 +4157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
 
@@ -4140,6 +4174,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
-msgstr ""
+msgid "Please select one ore more closed ways of at least four nodes."
+msgstr "Prosim, izberite vsaj 4 vozlišča."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
@@ -4211,6 +4245,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
-msgstr ""
+msgid "Open an URL."
+msgstr "Odpri datoteko."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:54
@@ -4327,9 +4361,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+msgid "None of these nodes are glued to anything else."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
@@ -4569,6 +4603,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 
@@ -4599,6 +4633,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
-msgstr ""
+msgid "Can't duplicate unordered way."
+msgstr "Podvoji izbrano pot."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -4880,4 +4914,8 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
+msgstr ""
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
 msgstr ""
 
@@ -5707,5 +5745,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
@@ -6106,5 +6144,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Uvozi podatke iz Globalsat Datalogger DG100 naprave v plast GPX."
 
@@ -6123,6 +6161,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
@@ -6143,6 +6181,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6283,5 +6319,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
+msgid "Open another GPX trace"
 msgstr ""
 
@@ -6367,5 +6403,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
+msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
@@ -6411,9 +6447,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
-msgstr ""
+msgid "Update Site URL"
+msgstr "Osnovni URL naslov strežnika"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr ""
 
@@ -6477,5 +6513,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
 
@@ -6551,5 +6587,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
@@ -6629,7 +6665,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6669,5 +6705,5 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr ""
 
@@ -6718,5 +6754,5 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
@@ -6778,9 +6814,9 @@
 msgstr "okrajšano ime ceste"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr ""
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -6795,65 +6831,65 @@
 msgstr "Most"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr ""
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parkirišče"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr ""
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr ""
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr ""
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr ""
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr ""
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr ""
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr ""
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr ""
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Avtocesta"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Glavna cesta (1.,2. reda)"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Regionalna cesta (1.,2. reda)"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr ""
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr ""
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr ""
@@ -7809,10 +7845,10 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr ""
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
-msgstr ""
+msgid "Edit a Portcullis"
+msgstr "Uredi dók"
 
 #: trans_presets.java:905
@@ -8481,5 +8517,5 @@
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
+msgid "kebab"
 msgstr ""
 
@@ -10823,2 +10859,5 @@
 msgid "Edit Cliff"
 msgstr ""
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Izbor: %d poti in %d vozlišč"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 12692)
+++ applications/editors/josm/i18n/po/sv.po	(revision 12719)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-30 14:09+0100\n"
-"PO-Revision-Date: 2008-12-30 12:43+0000\n"
+"POT-Creation-Date: 2008-12-31 14:08+0100\n"
+"PO-Revision-Date: 2008-12-31 10:19+0000\n"
 "Last-Translator: Susanna Björverud <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-30 12:58+0000\n"
+"X-Launchpad-Export-Date: 2008-12-31 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -141,6 +141,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:116
 msgid ""
-"Try updating to the newest version of JOSM and all plugin before reporting a "
-"bug."
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
 msgstr ""
 "Innan du rapporterar in ett fel, försök först att uppdatera till den nyaste "
@@ -176,11 +176,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
-msgid "NullPointerException, Possibly some missing tags."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Det saknas förmodligen några taggar."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:466
 msgid "Preparing data..."
 msgstr "Förbereder data..."
@@ -203,36 +202,40 @@
 msgstr "Hämtar punkter {0} till {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Unknown version"
 msgstr "Okänd version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
 msgid "Found <nd> element in non-way."
 msgstr "Hittade element av typen <nd> på icke-sträcka"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 msgid "<nd> has zero ref"
 msgstr "<nd> har nollreferens"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-msgid "Found <member> tag on non-relation."
-msgstr "Fann <roll>-tagg utanför relation."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Found <member> element in non-relation."
+msgstr "Fann <member>-tagg utanför relation."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:254
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Illegal object with id=0"
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Det nödvändiga attributet \"{0}\" saknas."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462
-msgid "Illformed Node id"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+msgid "Skipping a way because it includes a node that doesn't exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
+msgid "Ill-formed node id"
 msgstr "Felformaterad nod-id"
 
@@ -246,5 +249,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Provide a brief comment as to the changes to you are uploading:"
+msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
 
@@ -397,11 +400,11 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:481
 #, java-format
-msgid "Ignoring malformed url: \"{0}\""
-msgstr "Hoppar över felaktig url: \"{0}\""
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "Hoppar över felaktig URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:494
 #, java-format
-msgid "Ignoring malformed file url: \"{0}\""
-msgstr "Hoppar över felaktig url till en fil: \"{0}\""
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:43
@@ -568,5 +571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
-"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
 msgstr ""
@@ -574,5 +577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
@@ -581,5 +584,5 @@
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
-"url which returns osm-xml"
+"URL which returns osm-xml"
 msgstr ""
 
@@ -655,5 +658,5 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Använd snabbval ''{0}'' i grupp ''{1}''"
+msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:391
@@ -780,5 +783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -790,5 +793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -834,5 +837,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -852,5 +855,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:497
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Role"
 msgstr "Roll"
@@ -901,5 +904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:341
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:98
@@ -921,18 +924,18 @@
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:202
 msgid "Create new relation"
 msgstr "Skapa ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:203
 msgid "Edit new relation"
 msgstr "Redigera ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:204
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Redigera relation # {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:248
 msgid ""
 "This is the basic relation editor which allows you to change the relation's "
@@ -946,46 +949,46 @@
 "dina valmöjligheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282
 msgid "Occupied By"
 msgstr "Innehas av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:298
 msgid "Tags (empty value deletes tag)"
 msgstr "Taggar (tomt värde tar bort taggen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Members"
 msgstr "Medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:308
-msgid "Move the currently selected member(s) up"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:305
+msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
-msgid "Move the currently selected member(s) down"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
 msgid "Add Selected"
 msgstr "Lägg till vald"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:328
 msgid "Add all currently selected objects as members"
 msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:334
 msgid "Delete Selected"
 msgstr "Ta bort de valda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:335
 msgid "Delete all currently selected objects from relation"
 msgstr "Ta bort alla de för närvarande valda objekten från relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:342
 msgid "Remove the member in the current table row from this relation"
 msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
@@ -996,33 +999,33 @@
 msgstr "Markera"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr ""
 "Markera medlemmen från den nuvarande tabellraden som JOSM:s valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:376
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:428
 #, java-format
 msgid "Members: {0}"
 msgstr "Medlemmar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:558
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:239
 msgid "There were conflicts during import."
 msgstr "Konflikter upptäcktes under import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:566
 msgid "Error parsing server response."
 msgstr "Fel vid inläsning av serverns svar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:571
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1036,5 +1039,5 @@
 msgstr "Fel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:570
 msgid "Cannot connect to server."
 msgstr "Kan inte ansluta till server."
@@ -1062,5 +1065,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
@@ -1155,14 +1158,14 @@
 msgstr "Slå ihop det lager som finns precis under med det valda lagret."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
 msgstr "Aktuellt urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
 msgid "Open a selection list window."
 msgstr "Öppna en urvalslista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -1171,29 +1174,51 @@
 msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Zoom to selected element(s)"
 msgstr "Zooma till valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 msgid "Refresh the selection list."
 msgstr "Uppdatera urvalslistan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Search"
 msgstr "Sök"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
 msgid "Search for objects."
 msgstr "Sök efter objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-msgid "Selection: %d way(s) and %d node(s)"
-msgstr "Urval: %d sträcka/sträckor och %d nod(er)"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#, fuzzy, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "Slå ihop {0} sträckor"
+msgstr[1] "Slå ihop {0} sträckor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] " ({0} nod)"
+msgstr[1] " ({0} noder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#, fuzzy, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "relation"
+msgstr[1] "relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#, fuzzy, java-format
+msgid "Selection: {0}"
+msgstr "Beskrivning: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:58
@@ -1230,5 +1255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: trans_surveyor.java:64
+#: trans_surveyor.java:81
 msgid "Info"
 msgstr "Information"
@@ -1337,5 +1362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-msgid "Make Audio Marker At Play Head"
+msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
@@ -1383,5 +1408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
 msgid ""
-"You need to Drag the play head near to the GPX track whose associated sound "
+"You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing."
 msgstr ""
@@ -1391,5 +1416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 msgid ""
-"You need to SHIFT-Drag the play head onto an audio marker or onto the track "
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
@@ -1398,5 +1423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
-msgid "Unable to create new Audio marker."
+msgid "Unable to create new audio marker."
 msgstr "Kunde inte skapa ny ljudmarkör."
 
@@ -2040,5 +2065,5 @@
 "<html>WARNING: The password is stored in plain text in the preferences file."
 "<br>The password is transfered in plain text to the server, encoded in the "
-"url.<br><b>Do not use a valuable Password.</b></html>"
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
@@ -2057,8 +2082,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 msgid ""
-"The sources (url or filename) of tagging preset definition files. See http://"
+"The sources (URL or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
-"Källorna (url eller filnamn) till de filer i vilka snabbval för taggning "
+"Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning "
 "definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
 "information."
@@ -2309,6 +2334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Början av spåret (detta görs alltid om det inte finns några andra markörer)."
+msgstr "Början av spåret (görs alltid om det inte finns andra markörer)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55
@@ -3166,9 +3190,9 @@
 msgstr "Kunde inte hämta inställningar från server."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:664
 msgid "untagged"
 msgstr "otaggade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "text"
 msgstr "text"
@@ -3293,5 +3317,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:22
 msgid "OSM History Information"
-msgstr "Information om OSM-historik"
+msgstr "OSM-historik"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
@@ -3576,10 +3600,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is no inner part of any way."
-msgid_plural "The selected nodes are no inner part of any way."
+#, fuzzy
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Den valda noden utgör inte en inre del av någon sträcka"
 msgstr[1] "De valda noderna utgör inte en inre del av någon sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -3588,9 +3613,9 @@
 "Den nod/de noder du valt ingår i mer än en sträcka. Välj sträckan också."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
 msgid "The selected nodes do not share the same way."
 msgstr "De valda noderna ingår inte i samma sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -3598,10 +3623,10 @@
 msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:212
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -3611,5 +3636,5 @@
 "sträckan.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -3619,5 +3644,5 @@
 "Du bör kontrollera detta och rätta till eventuella fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3752,5 +3777,5 @@
 msgstr "Kunde inte öppna \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -3758,6 +3783,6 @@
 msgstr "Okänt filformat: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
@@ -3766,29 +3791,29 @@
 msgstr "Markörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:133
 msgid "Coordinates imported: "
 msgstr "Koordinater importerade: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Malformed sentences: "
 msgstr "Felaktigt utformade meningar: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Checksum errors: "
 msgstr "Checksum-fel: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Unknown sentences: "
 msgstr "Okända meningar: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
 msgid "Zero coordinates: "
 msgstr "Nollkoordinater: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142
 msgid "NMEA import success"
 msgstr "Import från NMEA genomförd"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:146
 msgid "NMEA import faliure!"
 msgstr "Import från NMEA misslyckades!"
@@ -3818,11 +3843,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
-msgid "Could not read from url: \"{0}\""
-msgstr "Kunde inte läsa från url:en: \"{0}\""
+msgid "Could not read from URL: \"{0}\""
+msgstr "Kunde inte läsa från URL:en: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr "Inläsningsfel på url:en: \"{0}\""
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Inläsningsfel på URL:en: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:39
@@ -4177,5 +4202,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
 msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; "
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
@@ -4185,5 +4210,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
+#: trans_surveyor.java:85
 msgid "Exit"
 msgstr "Avsluta"
@@ -4233,5 +4258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Move nodes so all angles are 90 or 270deg"
+msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
 
@@ -4250,5 +4275,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-msgid "Please select closed way(s) of at least four nodes."
+msgid "Please select one ore more closed ways of at least four nodes."
 msgstr "Välj slutna sträckor som består av åtminstone fyra noder."
 
@@ -4323,5 +4348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Open a URL."
+msgid "Open an URL."
 msgstr "Öppna en URL."
 
@@ -4439,9 +4464,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
-msgid "None of these nodes is glued to anything else."
+#, fuzzy
+msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av dessa noder är bundna till något annat."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
-msgid "None of this way's nodes is glued to anything else."
+#, fuzzy
+msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen av noderna i denna sträcka är bunden till någonting annat."
 
@@ -4693,6 +4720,6 @@
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
 msgid ""
-"When reverting this way, following changes to properties of the way and its "
-"nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
 msgstr ""
 "Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
@@ -4725,6 +4752,6 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
-msgid "Can't duplicate unnordered way."
-msgstr ""
+msgid "Can't duplicate unordered way."
+msgstr "Skapa en dubblett av sträcka"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -5017,4 +5044,8 @@
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
+
+#: ../plugins/namefinder/namefinder/PlaceSelection.java:120
+msgid "NullPointerException, Possibly some missing tags."
+msgstr "NullPointerException, Det saknas förmodligen några taggar."
 
 #: ../plugins/namefinder/namefinder/PlaceSelection.java:168
@@ -5515,11 +5546,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:50
 msgid "Untagged, empty, and one node ways."
-msgstr "Sträckor som saknar tagg, är tomma, eller består av en enda nod."
+msgstr "Otaggade, tomma eller ennodssträckor."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:51
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
-"som saknar tagg, är tomma, eller består av en enda nod.Detta test letar "
-"efter sträckor"
+"Detta test letar efter sträckor som saknar tagg, är tomma, eller består av "
+"en enda nod."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:76
@@ -5734,5 +5765,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:102
 msgid "Way end node near other way"
-msgstr "Slutnod nära annan stäcka"
+msgstr "Slutnod nära annan sträcka"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:123
@@ -5873,8 +5904,8 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid ""
-"The sources (url or filename) of spell check (see http://wiki.openstreetmap."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-"De källor (url eller filnamn) som används för att stavningskontrollera (läs "
+"De källor (URL eller filnamn) som används för att stavningskontrollera (läs "
 "http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller "
 "taggkontrollera datafiler."
@@ -6281,5 +6312,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPXLayer."
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importera data från en Globalsat Datalogger DG100 in i ett GPX-lager"
 
@@ -6298,11 +6329,11 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.This "
-"can lead to nodes beeing deleted accidentially.\n"
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
 "Are you really sure to continue?"
 msgstr ""
 "Den eller de valda sträckorna har noder som ligger utanför det område för "
-"vilket data har hämtats. Detta kan leda till att noder oavsiktligt tas "
-"bort.\n"
+"vilket data har hämtats.\n"
+"Detta kan leda till att noder oavsiktligt tas bort.\n"
 "Är du säker på att du vill fortsätta?"
 
@@ -6316,12 +6347,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
-"Urvalet innehåller {0} sträcka. Är du säker på att du förenkla dem alla?"
 msgstr[1] ""
-"Urvalet innehåller {0} sträckor. Är du säker på att du förenkla dem alla?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -6469,6 +6498,6 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:443
-msgid "Open an other GPXtrace"
-msgstr ""
+msgid "Open another GPX trace"
+msgstr "Öppna ett annat foto"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
@@ -6559,6 +6588,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:256
-msgid "No GpxLayer selected. Cannot upload a trace."
-msgstr "Inget Gpxlager valt. Kan inte skicka in ett spår."
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr "Inget GPX-lager valt. Kan inte skicka in ett spår."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -6603,9 +6632,9 @@
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site Url"
+msgid "Update Site URL"
 msgstr "Uppdatera URL för webbplats"
 
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid Url"
+msgid "Invalid URL"
 msgstr "Ogiltig URL"
 
@@ -6674,5 +6703,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifer WMS"
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr "Hämta en korrigerad bild från Metacartas kartkorrigerar-WMS"
 
@@ -6749,5 +6778,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 #, java-format
-msgid "WMS layer ({0}), automaticaly downloading in zoom {1}"
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
@@ -6827,7 +6856,7 @@
 "format=image/jpeg \n"
 "\n"
-"For Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , you only "
-"need to input the relevant 'id'.\n"
-"To add a Metacarta Map Rectifer menu item, manually create the url like in "
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+"only need to input the relevant 'id'.\n"
+"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
 "this example,replacing 73 with your image id: \n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
@@ -6890,5 +6919,6 @@
 
 #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for autorouting. Middle Mouse button to reset."
+#, fuzzy
+msgid "Set start/end for routing. Middle mouse button to reset."
 msgstr "Ange start/slut för autorouting. Mellersta musknappen återställer."
 
@@ -6939,5 +6969,6 @@
 
 #: trans_wms.java:19
-msgid "Strassen NRW Geofabrik.de"
+#, fuzzy
+msgid "Streets NRW Geofabrik.de"
 msgstr "Strassen NRW Geofabrik.de"
 
@@ -6999,9 +7030,9 @@
 msgstr "förkortat gatunamn"
 
-#: trans_surveyor.java:6
+#: trans_surveyor.java:23
 msgid "Tunnel Start"
 msgstr "Början på tunnel"
 
-#: trans_surveyor.java:12 trans_presets.java:53 trans_presets.java:70
+#: trans_surveyor.java:29 trans_presets.java:53 trans_presets.java:70
 #: trans_presets.java:89 trans_presets.java:107 trans_presets.java:128
 #: trans_presets.java:145 trans_presets.java:164 trans_presets.java:182
@@ -7016,65 +7047,65 @@
 msgstr "Bro"
 
-#: trans_surveyor.java:16
+#: trans_surveyor.java:33
 msgid "Village/City"
 msgstr "By/Stad"
 
-#: trans_surveyor.java:24 trans_presets.java:1275 trans_presets.java:1322
+#: trans_surveyor.java:41 trans_presets.java:1275 trans_presets.java:1322
 msgid "Parking"
 msgstr "Parkeringsplats"
 
-#: trans_surveyor.java:29
+#: trans_surveyor.java:46
 msgid "One Way"
 msgstr "Enkelriktat"
 
-#: trans_surveyor.java:33
+#: trans_surveyor.java:50
 msgid "Church"
 msgstr "Kyrka"
 
-#: trans_surveyor.java:38
+#: trans_surveyor.java:55
 msgid "Fuel Station"
 msgstr "Bensinstation"
 
-#: trans_surveyor.java:43 trans_presets.java:1453
+#: trans_surveyor.java:60 trans_presets.java:1453
 msgid "Hotel"
 msgstr "Hotell"
 
-#: trans_surveyor.java:47 trans_presets.java:1507
+#: trans_surveyor.java:64 trans_presets.java:1507
 msgid "Restaurant"
 msgstr "Restaurang"
 
-#: trans_surveyor.java:52
+#: trans_surveyor.java:69
 msgid "Shopping"
 msgstr "Handel"
 
-#: trans_surveyor.java:56
+#: trans_surveyor.java:73
 msgid "WC"
 msgstr "WC"
 
-#: trans_surveyor.java:60
+#: trans_surveyor.java:77
 msgid "Camping"
 msgstr "Camping"
 
-#: trans_surveyor.java:72 trans_presets.java:40
+#: trans_surveyor.java:89 trans_presets.java:40
 msgid "Motorway"
 msgstr "Motorväg"
 
-#: trans_surveyor.java:76 trans_presets.java:115
+#: trans_surveyor.java:93 trans_presets.java:115
 msgid "Primary"
 msgstr "Primär"
 
-#: trans_surveyor.java:80 trans_presets.java:151
+#: trans_surveyor.java:97 trans_presets.java:151
 msgid "Secondary"
 msgstr "Sekundär"
 
-#: trans_surveyor.java:84 trans_presets.java:188
+#: trans_surveyor.java:105 trans_presets.java:188
 msgid "Unclassified"
 msgstr "Oklassificerad"
 
-#: trans_surveyor.java:88 trans_presets.java:206
+#: trans_surveyor.java:109 trans_presets.java:206
 msgid "Residential"
 msgstr "Bostadsområde"
 
-#: trans_surveyor.java:93 trans_surveyor.java:97
+#: trans_surveyor.java:114 trans_surveyor.java:118
 msgid "Test"
 msgstr "Test"
@@ -8032,9 +8063,9 @@
 
 #: trans_presets.java:893
-msgid "Porticullis"
+msgid "Portcullis"
 msgstr "Fällgaller"
 
 #: trans_presets.java:894
-msgid "Edit a Porticullis"
+msgid "Edit a Portcullis"
 msgstr "Redigera ett fällgaller"
 
@@ -8093,5 +8124,5 @@
 #: trans_presets.java:977
 msgid "Retaining Wall"
-msgstr ""
+msgstr "Stödmur"
 
 #: trans_presets.java:981
@@ -8101,5 +8132,5 @@
 #: trans_presets.java:982
 msgid "Edit Toll Booth"
-msgstr ""
+msgstr "Redigera betalstation"
 
 #: trans_presets.java:992
@@ -8329,5 +8360,5 @@
 #: trans_presets.java:1195
 msgid "Edit a Bus Guideway"
-msgstr ""
+msgstr "Redigera en spårbussväg"
 
 #: trans_presets.java:1215
@@ -8421,5 +8452,5 @@
 #: trans_presets.java:1280
 msgid "underground"
-msgstr ""
+msgstr "underjordisk"
 
 #: trans_presets.java:1280
@@ -8429,17 +8460,17 @@
 #: trans_presets.java:1281
 msgid "Spaces for Disabled"
-msgstr ""
+msgstr "Handikappplatser"
 
 #: trans_presets.java:1282
 msgid "Fee"
-msgstr ""
+msgstr "Avgift"
 
 #: trans_presets.java:1285
 msgid "Wash"
-msgstr ""
+msgstr "Biltvätt"
 
 #: trans_presets.java:1286
 msgid "Edit Car Wash"
-msgstr ""
+msgstr "Redigera en biltvätt"
 
 #: trans_presets.java:1292 trans_presets.java:1334
@@ -8453,9 +8484,9 @@
 #: trans_presets.java:1299
 msgid "Repair"
-msgstr ""
+msgstr "Bilverkstad"
 
 #: trans_presets.java:1300
 msgid "Edit Car Repair"
-msgstr ""
+msgstr "Redigera en bilverkstad"
 
 #: trans_presets.java:1306 trans_presets.java:1328
@@ -8601,5 +8632,5 @@
 #: trans_presets.java:1457
 msgid "Stars"
-msgstr ""
+msgstr "Stjärnor"
 
 #: trans_presets.java:1460
@@ -8613,17 +8644,17 @@
 #: trans_presets.java:1466
 msgid "Guest House"
-msgstr ""
+msgstr "Pensionat"
 
 #: trans_presets.java:1467
 msgid "Edit Guest House"
-msgstr ""
+msgstr "Redigera pensionat"
 
 #: trans_presets.java:1472
 msgid "Chalet"
-msgstr ""
+msgstr "Fäbod"
 
 #: trans_presets.java:1473
 msgid "Edit Chalet"
-msgstr ""
+msgstr "Redigera fäbod"
 
 #: trans_presets.java:1478
@@ -8637,9 +8668,9 @@
 #: trans_presets.java:1484
 msgid "Alpine Hut"
-msgstr ""
+msgstr "Alphydda"
 
 #: trans_presets.java:1485
 msgid "Edit Alpine Hut"
-msgstr ""
+msgstr "Redigera alphydda"
 
 #: trans_presets.java:1491
@@ -8669,61 +8700,61 @@
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "Cuisine"
-msgstr ""
+msgstr "Kök"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "italian"
-msgstr ""
+msgstr "italienskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "chinese"
-msgstr ""
+msgstr "kinesiskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "pizza"
-msgstr ""
+msgstr "pizza"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "burger"
-msgstr ""
+msgstr "hamburgare"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "greek"
-msgstr ""
+msgstr "grekiskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "german"
-msgstr ""
+msgstr "tyskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "indian"
-msgstr ""
+msgstr "indiskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "regional"
-msgstr ""
+msgstr "lokalt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
-msgid "kebap"
-msgstr ""
+msgid "kebab"
+msgstr "kebab"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "turkish"
-msgstr ""
+msgstr "turkiskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "asian"
-msgstr ""
+msgstr "asiatiskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "thai"
-msgstr ""
+msgstr "thailändskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "mexican"
-msgstr ""
+msgstr "mexikanskt"
 
 #: trans_presets.java:1511 trans_presets.java:1518
 msgid "japanese"
-msgstr ""
+msgstr "japanskt"
 
 #: trans_presets.java:1514
@@ -8753,9 +8784,9 @@
 #: trans_presets.java:1533
 msgid "Biergarten"
-msgstr ""
+msgstr "Biergarten"
 
 #: trans_presets.java:1534
 msgid "Edit Biergarten"
-msgstr ""
+msgstr "Redigera Biergarten"
 
 #: trans_presets.java:1539
@@ -8785,25 +8816,25 @@
 #: trans_presets.java:1554
 msgid "Edit Information Point"
-msgstr ""
+msgstr "Redigera informationspunkt"
 
 #: trans_presets.java:1556
 msgid "office"
-msgstr ""
+msgstr "kontor"
 
 #: trans_presets.java:1556
 msgid "map"
-msgstr ""
+msgstr "karta"
 
 #: trans_presets.java:1556
 msgid "citymap"
-msgstr ""
+msgstr "stadskarta"
 
 #: trans_presets.java:1556
 msgid "hikingmap"
-msgstr ""
+msgstr "vandringskarta"
 
 #: trans_presets.java:1556
 msgid "bicyclemap"
-msgstr ""
+msgstr "cykelkarta"
 
 #: trans_presets.java:1556
@@ -8813,5 +8844,5 @@
 #: trans_presets.java:1556
 msgid "history"
-msgstr ""
+msgstr "historiskt"
 
 #: trans_presets.java:1556
@@ -8821,9 +8852,9 @@
 #: trans_presets.java:1556
 msgid "wildlife"
-msgstr ""
+msgstr "djurliv"
 
 #: trans_presets.java:1556
 msgid "guidepost"
-msgstr ""
+msgstr "vägvisare"
 
 #: trans_presets.java:1560
@@ -8853,5 +8884,5 @@
 #: trans_presets.java:1576
 msgid "Look-Out Tower"
-msgstr ""
+msgstr "Utsiktstorn"
 
 #: trans_presets.java:1579
@@ -9099,5 +9130,5 @@
 #: trans_presets.java:1742
 msgid "cricket_nets"
-msgstr ""
+msgstr "kricket_nät"
 
 #: trans_presets.java:1712 trans_presets.java:1722 trans_presets.java:1732
@@ -9601,9 +9632,9 @@
 #: trans_presets.java:2021
 msgid "Embassy"
-msgstr ""
+msgstr "Ambassad"
 
 #: trans_presets.java:2022
 msgid "Edit Embassy"
-msgstr ""
+msgstr "Redigera ambassad"
 
 #: trans_presets.java:2027
@@ -9697,9 +9728,9 @@
 #: trans_presets.java:2097
 msgid "Arts Centre"
-msgstr ""
+msgstr "Konstcenter"
 
 #: trans_presets.java:2098
 msgid "Edit Arts Centre"
-msgstr ""
+msgstr "Redigera konstcenter"
 
 #: trans_presets.java:2103
@@ -9865,5 +9896,5 @@
 #: trans_presets.java:2130
 msgid "Country code"
-msgstr ""
+msgstr "Landskod"
 
 #: trans_presets.java:2133
@@ -9905,9 +9936,9 @@
 #: trans_presets.java:2148
 msgid "Tower"
-msgstr ""
+msgstr "Torn"
 
 #: trans_presets.java:2149
 msgid "Edit Tower"
-msgstr ""
+msgstr "Redigera torn"
 
 #: trans_presets.java:2154
@@ -9921,17 +9952,17 @@
 #: trans_presets.java:2160
 msgid "Gasometer"
-msgstr ""
+msgstr "Gasklocka"
 
 #: trans_presets.java:2161
 msgid "Edit Gasometer"
-msgstr ""
+msgstr "Redigera gasklocka"
 
 #: trans_presets.java:2166
 msgid "Covered Reservoir"
-msgstr ""
+msgstr "Täckt resevoar"
 
 #: trans_presets.java:2167
 msgid "Edit Covered Reservoir"
-msgstr ""
+msgstr "Redigera täckt resevoar"
 
 #: trans_presets.java:2172
@@ -9961,9 +9992,9 @@
 #: trans_presets.java:2190
 msgid "Pipeline"
-msgstr ""
+msgstr "Rörledning"
 
 #: trans_presets.java:2191
 msgid "Edit Pipeline"
-msgstr ""
+msgstr "Redigera rörledning"
 
 #: trans_presets.java:2196
@@ -10017,21 +10048,21 @@
 #: trans_presets.java:2231
 msgid "wind"
-msgstr ""
+msgstr "vindkraft"
 
 #: trans_presets.java:2231
 msgid "hydro"
-msgstr ""
+msgstr "vattenkraft"
 
 #: trans_presets.java:2231
 msgid "fossil"
-msgstr ""
+msgstr "fossila bränslen"
 
 #: trans_presets.java:2231
 msgid "nuclear"
-msgstr ""
+msgstr "kärnkraft"
 
 #: trans_presets.java:2231
 msgid "coal"
-msgstr ""
+msgstr "kolkraft"
 
 #: trans_presets.java:2231
@@ -10041,5 +10072,5 @@
 #: trans_presets.java:2231
 msgid "gas"
-msgstr ""
+msgstr "naturgas"
 
 #: trans_presets.java:2235
@@ -10073,17 +10104,17 @@
 #: trans_presets.java:2253
 msgid "Power Line"
-msgstr ""
+msgstr "Kraftledning"
 
 #: trans_presets.java:2254
 msgid "Edit power line"
-msgstr ""
+msgstr "Redigera kraftledning"
 
 #: trans_presets.java:2258
 msgid "Voltage"
-msgstr ""
+msgstr "Spänning"
 
 #: trans_presets.java:2259
 msgid "Amount of Wires"
-msgstr ""
+msgstr "Antal kablar"
 
 #: trans_presets.java:2265
@@ -10097,5 +10128,5 @@
 #: trans_presets.java:2270 trans_presets.java:2360
 msgid "Reference number"
-msgstr ""
+msgstr "Referensnummer"
 
 #: trans_presets.java:2271
@@ -10157,5 +10188,5 @@
 #: trans_presets.java:2296
 msgid "Cans"
-msgstr ""
+msgstr "Burkar"
 
 #: trans_presets.java:2297
@@ -10173,5 +10204,5 @@
 #: trans_presets.java:2300
 msgid "Scrap Metal"
-msgstr ""
+msgstr "Metallskrot"
 
 #: trans_presets.java:2303
@@ -10189,9 +10220,9 @@
 #: trans_presets.java:2311
 msgid "Hide"
-msgstr ""
+msgstr "Dölj"
 
 #: trans_presets.java:2312
 msgid "Lock"
-msgstr ""
+msgstr "Lås"
 
 #: trans_presets.java:2313 trans_presets.java:2790
@@ -10201,13 +10232,13 @@
 #: trans_presets.java:2313
 msgid "low"
-msgstr ""
+msgstr "låg"
 
 #: trans_presets.java:2313
 msgid "half"
-msgstr ""
+msgstr "halv"
 
 #: trans_presets.java:2313
 msgid "full"
-msgstr ""
+msgstr "full"
 
 #: trans_presets.java:2316
@@ -10333,5 +10364,5 @@
 #: trans_presets.java:2358
 msgid "telephone_vouchers"
-msgstr ""
+msgstr "telefonkort"
 
 #: trans_presets.java:2358
@@ -10449,9 +10480,9 @@
 #: trans_presets.java:2436
 msgid "Doctors"
-msgstr ""
+msgstr "Läkare"
 
 #: trans_presets.java:2437
 msgid "Edit Doctors"
-msgstr ""
+msgstr "Redigera läkare"
 
 #: trans_presets.java:2442
@@ -10665,9 +10696,9 @@
 #: trans_presets.java:2614
 msgid "Farmyard"
-msgstr ""
+msgstr "Gårdsplan"
 
 #: trans_presets.java:2615
 msgid "Edit Farmyard Landuse"
-msgstr ""
+msgstr "Redigera markanvändning som gårdsplan"
 
 #: trans_presets.java:2621
@@ -10805,9 +10836,9 @@
 #: trans_presets.java:2727
 msgid "Construction area"
-msgstr ""
+msgstr "Byggnadsplats"
 
 #: trans_presets.java:2728
 msgid "Edit Construction Landuse"
-msgstr ""
+msgstr "Redigera markanvändning som byggnadsplats"
 
 #: trans_presets.java:2734
@@ -10865,9 +10896,9 @@
 #: trans_presets.java:2779
 msgid "Land"
-msgstr ""
+msgstr "Land"
 
 #: trans_presets.java:2780
 msgid "Edit Land"
-msgstr ""
+msgstr "Redigera land"
 
 #: trans_presets.java:2785
@@ -10877,5 +10908,5 @@
 #: trans_presets.java:2786
 msgid "Edit a Tree"
-msgstr ""
+msgstr "Redigera ett träd"
 
 #: trans_presets.java:2791
@@ -10893,9 +10924,9 @@
 #: trans_presets.java:2800
 msgid "Cave Entrance"
-msgstr ""
+msgstr "Grottöppning"
 
 #: trans_presets.java:2801
 msgid "Edit Cave Entrance"
-msgstr ""
+msgstr "Redigera en grottöppning"
 
 #: trans_presets.java:2806
@@ -10981,13 +11012,13 @@
 #: trans_presets.java:2872
 msgid "Wetland"
-msgstr ""
+msgstr "Våtmark"
 
 #: trans_presets.java:2873
 msgid "Edit Wetland"
-msgstr ""
+msgstr "Redigera våtmark"
 
 #: trans_presets.java:2876
 msgid "swamp"
-msgstr ""
+msgstr "träsk"
 
 #: trans_presets.java:2876
@@ -11013,5 +11044,5 @@
 #: trans_presets.java:2876
 msgid "mangrove"
-msgstr ""
+msgstr "mangroveträsk"
 
 #: trans_presets.java:2879
@@ -11033,9 +11064,9 @@
 #: trans_presets.java:2891
 msgid "Bay"
-msgstr ""
+msgstr "Bukt"
 
 #: trans_presets.java:2892
 msgid "Edit Bay"
-msgstr ""
+msgstr "Redigera bukt"
 
 #: trans_presets.java:2897
@@ -11046,2 +11077,5 @@
 msgid "Edit Cliff"
 msgstr "Redigera stup"
+
+#~ msgid "Selection: %d way(s) and %d node(s)"
+#~ msgstr "Urval: %d sträcka/sträckor och %d nod(er)"
